diff -crN ./GConf/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/Makefile.in *** ./GConf/Makefile.in Tue Jan 21 04:30:16 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/Makefile.in Sat Aug 9 21:09: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,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = . ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** 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 = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ BDB_CFLAGS = @BDB_CFLAGS@ *************** *** 72,77 **** --- 71,77 ---- CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ + DEPDIR = @DEPDIR@ DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ DEPENDENT_LIBS = @DEPENDENT_LIBS@ DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ *************** *** 100,105 **** --- 100,106 ---- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INDENT = @INDENT@ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ *************** *** 109,115 **** LN_S = @LN_S@ MAINT = @MAINT@ MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 110,115 ---- *************** *** 129,230 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ gconflocaledir = @gconflocaledir@ l = @l@ SUBDIRS = gconf backends po doc examples DIST_SUBDIRS = tests $(SUBDIRS) ! EXTRA_DIST = gconf.m4.in gconf.spec.in gconf.spec TODO gconf-2.0.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gconf-2.0.pc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = gconf.spec gconf.m4 gconf-2.0.pc ! DATA = $(pkgconfig_DATA) ! ! DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h acinclude.m4 \ ! aclocal.m4 config.guess config.h.in config.sub configure configure.in \ ! gconf-2.0.pc.in gconf.m4.in gconf.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) ! 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: gconf.spec: $(top_builddir)/config.status gconf.spec.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status gconf.m4: $(top_builddir)/config.status gconf.m4.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status gconf-2.0.pc: $(top_builddir)/config.status gconf-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 --- 129,244 ---- USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ + am__include = @am__include@ + am__quote = @am__quote@ gconflocaledir = @gconflocaledir@ + install_sh = @install_sh@ l = @l@ SUBDIRS = gconf backends po doc examples DIST_SUBDIRS = tests $(SUBDIRS) ! EXTRA_DIST = gconf.m4.in gconf.spec.in gconf.spec TODO \ ! gconf-2.0.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gconf-2.0.pc + subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h ! CONFIG_CLEAN_FILES = gconf.spec gconf.m4 gconf-2.0.pc ! depcomp = ! DIST_SOURCES = ! DATA = $(pkgconfig_DATA) ! ! ! RECURSIVE_TARGETS = info-recursive dvi-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 ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ ! INSTALL Makefile.am Makefile.in NEWS TODO acconfig.h \ ! acinclude.m4 aclocal.m4 config.guess config.h.in config.sub \ ! configure configure.in gconf-2.0.pc.in gconf.m4.in \ ! gconf.spec.in install-sh ltmain.sh missing mkinstalldirs ! all: config.h ! $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs ! distclean-libtool: ! -rm -f libtool ! $(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) && \ ! CONFIG_HEADERS= CONFIG_LINKS= \ ! CONFIG_FILES=$@ $(SHELL) ./config.status ! ! $(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-h @if test ! -f $@; then \ rm -f stamp-h; \ $(MAKE) stamp-h; \ else :; fi stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + @rm -f stamp-h stamp-hT + @echo timestamp > stamp-hT 2> /dev/null cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status ! @mv stamp-hT stamp-h ! $(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) $(top_srcdir)/acconfig.h ! @rm -f $(srcdir)/./stamp-h.in $(srcdir)/./stamp-h.inT ! @echo timestamp > $(srcdir)/./stamp-h.inT 2> /dev/null cd $(top_srcdir) && $(AUTOHEADER) ! @mv $(srcdir)/./stamp-h.inT $(srcdir)/./stamp-h.in distclean-hdr: -rm -f config.h gconf.spec: $(top_builddir)/config.status gconf.spec.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status gconf.m4: $(top_builddir)/config.status gconf.m4.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status gconf-2.0.pc: $(top_builddir)/config.status gconf-2.0.pc.in ! cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status ! uninstall-info-am: 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 " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \ ! $(INSTALL_DATA) $$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 *************** *** 233,244 **** # (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//`; \ --- 247,253 ---- # (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//`; \ *************** *** 261,271 **** 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"; \ --- 270,285 ---- 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"; \ *************** *** 284,367 **** 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 $(DIST_SUBDIRS); do \ --- 298,363 ---- tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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 $(LISP) ! 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) $(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)config.h.in$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + top_distdir = . + # Avoid unsightly `./'. distdir = $(PACKAGE)-$(VERSION) ! GZIP_ENV = --best ! distdir: $(DISTFILES) ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) mkdir $(distdir) ! $(mkinstalldirs) $(distdir)/. $(distdir)/gconf $(distdir)/po @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done for subdir in $(DIST_SUBDIRS); do \ *************** *** 369,455 **** 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-local 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-local 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 install-data-local: --- 365,507 ---- 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: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(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 ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(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=`CDPATH=: && 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) uninstall \ ! && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ ! || (echo "Error: files left after uninstall" 1>&2; \ ! exit 1) ) \ ! && $(MAKE) $(AM_MAKEFLAGS) dist \ ! && $(MAKE) $(AM_MAKEFLAGS) distclean \ ! && rm -f $(distdir).tar.gz \ ! && (test `find . -type f -print | wc -l` -eq 0 \ ! || (echo "Error: files left after distclean" 1>&2; \ ! exit 1) ) ! -chmod -R a+w $(distdir) > /dev/null 2>&1; rm -rf $(distdir) ! @echo "$(distdir).tar.gz is ready for distribution" | \ ! sed 'h;s/./=/g;p;x;p;x' 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)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* 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 ! dist-all: distdir ! $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz ! -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir) ! distclean: distclean-recursive ! -rm -f config.status config.cache config.log ! 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-data-local install-pkgconfigDATA ! ! 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 ! ! uninstall-am: uninstall-info-am uninstall-pkgconfigDATA ! ! uninstall-info: uninstall-info-recursive ! ! .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ ! clean-generic clean-libtool clean-recursive dist dist-all \ ! distcheck distclean distclean-generic distclean-hdr \ ! 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-local \ ! 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 tags tags-recursive \ ! uninstall uninstall-am uninstall-info-am \ ! uninstall-info-recursive uninstall-pkgconfigDATA \ ! uninstall-recursive install-data-local: *************** *** 462,468 **** install-schemas: (cd standard-schemas && $(MAKE) $(AM_MAKEFLAGS) install-schemas) - # 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: --- 514,519 ---- diff -crN ./GConf/aclocal.m4 /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/aclocal.m4 *** ./GConf/aclocal.m4 Tue Jan 21 04:29:18 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/aclocal.m4 Sat Aug 9 21:08:51 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. # Macro to add for using GNU gettext. --- 1,15 ---- ! # aclocal.m4 generated automatically by aclocal 1.5 ! # Copyright 1996, 1997, 1998, 1999, 2000, 2001 ! # 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. # Macro to add for using GNU gettext. *************** *** 350,376 **** < $srcdir/po/POTFILES.in > po/POTFILES ]) - # progtest.m4 serial 2 (gettext-0.10.40) - dnl Copyright (C) 1996-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. - dnl - dnl This file can can be used in projects which are not available under - dnl the GNU General Public License or the GNU Library General Public - dnl License but which still want to provide support for the GNU gettext - dnl functionality. - dnl Please note that the actual code of the GNU gettext library is covered - dnl by the GNU Library General Public License, and the rest of the GNU - dnl gettext package package is covered by the GNU General Public License. - dnl They are *not* in the public domain. - - dnl Authors: - dnl Ulrich Drepper , 1996. - # Search path for a program which passes the given test. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) --- 351,369 ---- < $srcdir/po/POTFILES.in > po/POTFILES ]) # Search path for a program which passes the given test. + # Ulrich Drepper , 1996. + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU General Public + # License or the GNU Library General Public License but which still want + # to provide support for the GNU gettext functionality. + # Please note that the actual code of the GNU gettext library is covered + # by the GNU Library General Public License, and the rest of the GNU + # gettext package package is covered by the GNU General Public License. + # They are *not* in the public domain. + + # serial 2 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) *************** *** 410,425 **** AC_SUBST($1)dnl ]) ! # 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) --- 403,409 ---- AC_SUBST($1)dnl ]) ! #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) *************** *** 437,583 **** ] ) - # lcmessage.m4 serial 3 (gettext-0.11.3) - 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. - dnl - dnl This file can can be used in projects which are not available under - dnl the GNU General Public License or the GNU Library General Public - dnl License but which still want to provide support for the GNU gettext - dnl functionality. - dnl Please note that the actual code of the GNU gettext library is covered - dnl by the GNU Library General Public License, and the rest of the GNU - dnl gettext package package is covered by the GNU General Public License. - dnl They are *not* in the public domain. - - dnl Authors: - dnl Ulrich Drepper , 1995. - # Check whether LC_MESSAGES is available in . AC_DEFUN([AM_LC_MESSAGES], ! [ ! AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ! [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ! if test $am_cv_val_LC_MESSAGES = yes; then ! AC_DEFINE(HAVE_LC_MESSAGES, 1, ! [Define if your file defines LC_MESSAGES.]) ! fi ! ]) # 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. ! ! # 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 ! ! # AM_AUTOMAKE_VERSION(VERSION) ! # ---------------------------- ! # 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 --- 421,635 ---- ] ) # Check whether LC_MESSAGES is available in . + # Ulrich Drepper , 1995. + # + # This file can be copied and used freely without restrictions. It can + # be used in projects which are not available under the GNU General Public + # License or the GNU Library General Public License but which still want + # to provide support for the GNU gettext functionality. + # Please note that the actual code of the GNU gettext library is covered + # by the GNU Library General Public License, and the rest of the GNU + # gettext package package is covered by the GNU General Public License. + # They are *not* in the public domain. + + # serial 2 AC_DEFUN([AM_LC_MESSAGES], ! [if test $ac_cv_header_locale_h = yes; then ! AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ! [AC_TRY_LINK([#include ], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ! if test $am_cv_val_LC_MESSAGES = yes; then ! AC_DEFINE(HAVE_LC_MESSAGES, 1, ! [Define if your file defines LC_MESSAGES.]) ! fi ! fi]) # Like AC_CONFIG_HEADER, but automatically create stamp file. + # serial 3 + + # 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. We must strip everything past the first ":", + # and everything past the last "/". + + AC_PREREQ([2.12]) + AC_DEFUN([AM_CONFIG_HEADER], ! [ifdef([AC_FOREACH],dnl ! [dnl init our file count if it isn't already ! m4_ifndef([_AM_Config_Header_Index], m4_define([_AM_Config_Header_Index], [0])) ! dnl prepare to store our destination file list for use in config.status ! AC_FOREACH([_AM_File], [$1], ! [m4_pushdef([_AM_Dest], m4_patsubst(_AM_File, [:.*])) ! m4_define([_AM_Config_Header_Index], m4_incr(_AM_Config_Header_Index)) ! dnl and add it to the list of files AC keeps track of, along ! dnl with our hook ! AC_CONFIG_HEADERS(_AM_File, ! dnl COMMANDS, [, INIT-CMDS] ! [# update the timestamp ! echo timestamp >"AS_ESCAPE(_AM_DIRNAME(]_AM_Dest[))/stamp-h]_AM_Config_Header_Index[" ! ][$2]m4_ifval([$3], [, [$3]]))dnl AC_CONFIG_HEADERS ! m4_popdef([_AM_Dest])])],dnl ! [AC_CONFIG_HEADER([$1]) ! AC_OUTPUT_COMMANDS( ! ifelse(patsubst([$1], [[^ ]], []), ! [], ! [test -z "$CONFIG_HEADERS" || echo timestamp >dnl ! patsubst([$1], [^\([^:]*/\)?.*], [\1])stamp-h]),dnl ! [am_indx=1 ! for am_file in $1; do ! case " \$CONFIG_HEADERS " in ! *" \$am_file "*) ! am_dir=\`echo \$am_file |sed 's%:.*%%;s%[^/]*\$%%'\` ! if test -n "\$am_dir"; then ! am_tmpdir=\`echo \$am_dir |sed 's%^\(/*\).*\$%\1%'\` ! for am_subdir in \`echo \$am_dir |sed 's%/% %'\`; do ! am_tmpdir=\$am_tmpdir\$am_subdir/ ! if test ! -d \$am_tmpdir; then ! mkdir \$am_tmpdir ! fi ! done ! fi ! echo timestamp > "\$am_dir"stamp-h\$am_indx ;; esac ! am_indx=\`expr \$am_indx + 1\` ! done]) ! ])]) # AM_CONFIG_HEADER ! ! # _AM_DIRNAME(PATH) ! # ----------------- ! # Like AS_DIRNAME, only do it during macro expansion ! AC_DEFUN([_AM_DIRNAME], ! [m4_if(m4_regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, ! m4_if(m4_regexp([$1], [^//\([^/]\|$\)]), -1, ! m4_if(m4_regexp([$1], [^/.*]), -1, ! [.], ! m4_patsubst([$1], [^\(/\).*], [\1])), ! m4_patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), ! m4_patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl ! ]) # _AM_DIRNAME # 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 5 ! ! # 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... ! ! ! # We require 2.13 because we rely on SHELL being computed by configure. ! AC_PREREQ([2.13]) ! ! # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) ! # ----------------------------------------------------------- ! # If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. ! # The purpose of this macro is to provide the user with a means to ! # check macros which are provided without letting her know how the ! # information is coded. ! # If this macro is not defined by Autoconf, define it here. ! ifdef([AC_PROVIDE_IFELSE], ! [], ! [define([AC_PROVIDE_IFELSE], ! [ifdef([AC_PROVIDE_$1], ! [$2], [$3])])]) + # AM_INIT_AUTOMAKE(PACKAGE,VERSION, [NO-DEFINE]) + # ---------------------------------------------- AC_DEFUN([AM_INIT_AUTOMAKE], ! [AC_REQUIRE([AC_PROG_INSTALL])dnl ! # test to see if srcdir already configured ! if test "`CDPATH=:; cd $srcdir && pwd`" != "`pwd`" && ! test -f $srcdir/config.status; then ! AC_MSG_ERROR([source directory already configured; run \"make distclean\" there first]) fi ! # Define the identity of the package. ! PACKAGE=$1 ! AC_SUBST(PACKAGE)dnl ! VERSION=$2 ! AC_SUBST(VERSION)dnl ! ifelse([$3],, ! [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])]) ! # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow ! # the ones we care about. ! ifdef([m4_pattern_allow], ! [m4_pattern_allow([^AM_[A-Z]+FLAGS])])dnl ! ! # Autoconf 2.50 always computes EXEEXT. However we need to be ! # compatible with 2.13, for now. So we always define EXEEXT, but we ! # don't compute it. ! AC_SUBST(EXEEXT) ! # Similar for OBJEXT -- only we only use OBJEXT if the user actually ! # requests that it be used. This is a bit dumb. ! : ${OBJEXT=o} ! AC_SUBST(OBJEXT) ! ! # Some tools Automake needs. ! AC_REQUIRE([AM_SANITY_CHECK])dnl ! AC_REQUIRE([AC_ARG_PROGRAM])dnl ! AM_MISSING_PROG(ACLOCAL, aclocal) ! AM_MISSING_PROG(AUTOCONF, autoconf) ! AM_MISSING_PROG(AUTOMAKE, automake) ! 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 ! AC_REQUIRE([AM_DEP_TRACK])dnl ! AC_REQUIRE([AM_SET_DEPDIR])dnl ! 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 ! ]) # # Check to make sure that the build environment is sane. # + # 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 *************** *** 587,593 **** alias in your environment]) fi ! test "[$]2" = conftestfile ) then # Ok. --- 639,645 ---- alias in your environment]) fi ! test "$[2]" = conftest.file ) then # Ok. *************** *** 596,619 **** 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 --- 648,997 ---- AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi AC_MSG_RESULT(yes)]) ! ! # serial 2 ! ! # 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= ! am_backtick='`' ! AC_MSG_WARN([${am_backtick}missing' script is too old or missing]) fi ! ]) ! ! # AM_AUX_DIR_EXPAND ! ! # 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. ! ! AC_DEFUN([AM_AUX_DIR_EXPAND], [ ! # expand $ac_aux_dir to an absolute path ! am_aux_dir=`CDPATH=:; cd $ac_aux_dir && pwd` ! ]) ! ! # AM_PROG_INSTALL_SH ! # ------------------ ! # Define $install_sh. ! 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)]) ! ! # 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 ! INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" ! AC_SUBST([INSTALL_STRIP_PROGRAM])]) ! ! # serial 4 -*- Autoconf -*- ! ! ! ! # 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" 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 conftest.c -o conftest.o >/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 ! ]) ! $1DEPMODE="depmode=$am_cv_$1_dependencies_compiler_type" ! AC_SUBST([$1DEPMODE]) ! ]) ! ! ! # 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]) ! pushdef([subst], defn([AC_SUBST])) ! subst(AMDEPBACKSLASH) ! popdef([subst]) ! ]) ! ! # Generate code to set up dependency tracking. ! # This macro should only be invoked once -- use via AC_REQUIRE. ! # Usage: ! # AM_OUTPUT_DEPENDENCY_COMMANDS ! ! # ! # 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_OUTPUT_COMMANDS([ ! test x"$AMDEP_TRUE" != x"" || ! for mf in $CONFIG_FILES; do ! case "$mf" in ! Makefile) dirpart=.;; ! */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; ! *) continue;; ! esac ! 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=`echo "$file" | sed -e 's|/[^/]*$||'` ! $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 ! # echo "creating $dirpart/$file" ! echo '# dummy' > "$dirpart/$file" ! done ! done ! ], [AMDEP_TRUE="$AMDEP_TRUE" ! ac_aux_dir="$ac_aux_dir"])]) ! ! # 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 | fgrep -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 ! ]) ! ! # serial 3 ! ! # AM_CONDITIONAL(NAME, SHELL-CONDITION) ! # ------------------------------------- ! # Define a conditional. ! # ! # FIXME: Once using 2.50, use this: ! # m4_match([$1], [^TRUE\|FALSE$], [AC_FATAL([$0: invalid condition: $1])])dnl ! AC_DEFUN([AM_CONDITIONAL], ! [ifelse([$1], [TRUE], ! [errprint(__file__:__line__: [$0: invalid condition: $1 ! ])dnl ! m4exit(1)])dnl ! ifelse([$1], [FALSE], ! [errprint(__file__:__line__: [$0: invalid condition: $1 ! ])dnl ! m4exit(1)])dnl ! AC_SUBST([$1_TRUE]) ! AC_SUBST([$1_FALSE]) ! if $2; then ! $1_TRUE= ! $1_FALSE='#' ! else ! $1_TRUE='#' ! $1_FALSE= ! fi]) # Add --enable-maintainer-mode option to configure. # From Jim Meyering *************** *** 628,653 **** (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]) - # serial 1 --- 1006,1018 ---- (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 ] ) # serial 1 *************** *** 676,682 **** dnl FIXME: can't do this because then AC_AIX won't work due to a dnl circular dependency. dnl AC_BEFORE([$0], [AC_PROG_CPP]) ! AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) AC_CACHE_VAL(am_cv_prog_cc_stdc, [am_cv_prog_cc_stdc=no ac_save_CC="$CC" --- 1041,1047 ---- dnl FIXME: can't do this because then AC_AIX won't work due to a dnl circular dependency. dnl AC_BEFORE([$0], [AC_PROG_CPP]) ! AC_MSG_CHECKING([for ${CC-cc} option to accept ANSI C]) AC_CACHE_VAL(am_cv_prog_cc_stdc, [am_cv_prog_cc_stdc=no ac_save_CC="$CC" *************** *** 684,692 **** # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 ! # HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" AC_TRY_COMPILE( --- 1049,1058 ---- # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 ! # HP-UX 10.20 and later -Ae ! # HP-UX older versions -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" AC_TRY_COMPILE( *************** *** 728,734 **** if test -z "$am_cv_prog_cc_stdc"; then AC_MSG_RESULT([none needed]) else ! AC_MSG_RESULT($am_cv_prog_cc_stdc) fi case "x$am_cv_prog_cc_stdc" in x|xno) ;; --- 1094,1100 ---- if test -z "$am_cv_prog_cc_stdc"; then AC_MSG_RESULT([none needed]) else ! AC_MSG_RESULT([$am_cv_prog_cc_stdc]) fi case "x$am_cv_prog_cc_stdc" in x|xno) ;; *************** *** 765,772 **** 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 --- 1131,1136 ---- *************** *** 934,945 **** 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]]' ;; --- 1298,1306 ---- 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]]' ;; *************** *** 1036,1042 **** 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" --- 1397,1403 ---- 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" *************** *** 1580,1586 **** # 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*) --- 1941,1947 ---- # 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*) *************** *** 1623,1629 **** 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. --- 1984,1990 ---- 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. *************** *** 1667,1673 **** 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*) --- 2028,2038 ---- 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*) *************** *** 1889,1894 **** --- 2254,2260 ---- 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 *************** *** 2032,2038 **** # 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; --- 2398,2404 ---- # 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; *************** *** 2041,2047 **** 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`; --- 2407,2412 ---- *************** *** 2093,2122 **** hardcode_shlibpath_var=no ;; - linux*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - else - $archive_expsym_cmds="$archive_cmds" - fi - else - ld_shlibs=no - fi - ;; - *) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' --- 2458,2463 ---- *************** *** 2170,2194 **** 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 --- 2511,2523 ---- 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 *************** *** 2223,2237 **** 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 --- 2552,2558 ---- 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 *************** *** 2241,2248 **** # 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' --- 2562,2569 ---- # 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' *************** *** 2255,2261 **** 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 ;; --- 2576,2582 ---- 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 ;; *************** *** 2297,2305 **** 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 --- 2618,2625 ---- 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 *************** *** 2351,2364 **** 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 ;; --- 2671,2683 ---- 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 ;; *************** *** 2386,2392 **** 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 --- 2705,2711 ---- 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 *************** *** 2396,2402 **** 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 --- 2715,2721 ---- 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 *************** *** 2508,2530 **** ;; 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 ;; --- 2827,2839 ---- ;; 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 ;; *************** *** 2665,2673 **** 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' --- 2974,2979 ---- *************** *** 2689,2712 **** 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*) --- 2995,3006 ---- 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*) *************** *** 2754,2760 **** ;; 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' --- 3048,3054 ---- ;; 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' *************** *** 2837,2853 **** 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= ;; *) --- 3131,3144 ---- 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= ;; *) *************** *** 2951,2962 **** 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*) --- 3242,3252 ---- 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*) *************** *** 2999,3010 **** 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 --- 3289,3294 ---- *************** *** 3066,3072 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 3350,3356 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 3159,3168 **** # 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 \ --- 3443,3453 ---- # 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 \ *************** *** 3221,3231 **** # 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. --- 3506,3513 ---- # 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. *************** *** 3347,3352 **** --- 3629,3637 ---- # 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 *************** *** 3986,3992 **** # 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= --- 4271,4277 ---- # 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= *************** *** 4061,4069 **** 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" ;; --- 4346,4354 ---- 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" ;; *************** *** 4085,4091 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 4370,4376 ---- # 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 *************** *** 4156,4164 **** 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 --- 4441,4446 ---- *************** *** 4187,4193 **** # 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" --- 4469,4491 ---- # 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" *************** *** 4224,4235 **** ]) # 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. --- 4522,4533 ---- ]) # 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. *************** *** 4241,4258 **** 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. --- 4539,4554 ---- 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. *************** *** 4270,4283 **** 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 --- 4566,4577 ---- 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 *************** *** 4292,4386 **** # 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]) - ]) - dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page --- 4586,4591 ---- *************** *** 4625,4630 **** --- 4830,4837 ---- [CATOBJEXT=.mo DATADIRNAME=lib]) INSTOBJEXT=.mo + else + gt_cv_have_gettext=no fi fi ]) diff -crN ./GConf/backends/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/backends/Makefile.in *** ./GConf/backends/Makefile.in Tue Jan 21 04:30:19 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/backends/Makefile.in Sat Aug 9 21:09: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,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** 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 = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ BDB_CFLAGS = @BDB_CFLAGS@ *************** *** 72,77 **** --- 71,77 ---- CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ + DEPDIR = @DEPDIR@ DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ DEPENDENT_LIBS = @DEPENDENT_LIBS@ DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ *************** *** 100,105 **** --- 100,106 ---- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INDENT = @INDENT@ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ *************** *** 109,115 **** LN_S = @LN_S@ MAINT = @MAINT@ MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 110,115 ---- *************** *** 129,486 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ gconflocaledir = @gconflocaledir@ l = @l@ ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf $(DEPENDENT_WITH_XML_CFLAGS) $(BDB_CFLAGS) -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\" EXTRA_DIST = README.bdb backenddir = $(pkglibdir)/$(MAJOR_VERSION) @BDB_TRUE@BDBBACKEND = libgconfbackend-bdb.la @BDB_FALSE@BDBBACKEND = backend_LTLIBRARIES = libgconfbackend-xml.la $(BDBBACKEND) noinst_LTLIBRARIES = libgconfbackend-markup.la ! libgconfbackend_xml_la_SOURCES = xml-cache.h xml-cache.c xml-dir.h xml-dir.c xml-entry.h xml-entry.c xml-backend.c libgconfbackend_xml_la_LDFLAGS = -avoid-version -module ! libgconfbackend_xml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) libgconfbackend_bdb_la_SOURCES = bdb.c bdb.h bdb-backend.c val-encode.c val-encode.h dir-utils.c dir-utils.h libgconfbackend_bdb_la_LDFLAGS = -avoid-version -module libgconfbackend_bdb_la_LIBADD = $(DEPENDENT_LIBS) $(BDB_LIBS) ! libgconfbackend_markup_la_SOURCES = markup-backend.c markup-tree.h markup-tree.c libgconfbackend_markup_la_LDFLAGS = -avoid-version -module ! libgconfbackend_markup_la_LIBADD = $(DEPENDENT_LIBS) noinst_PROGRAMS = xml-test xml_test_SOURCES = $(libgconfbackend_xml_la_SOURCES) xml-test.c xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(backend_LTLIBRARIES) $(noinst_LTLIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! libgconfbackend_xml_la_DEPENDENCIES = ! libgconfbackend_xml_la_OBJECTS = xml-cache.lo xml-dir.lo xml-entry.lo \ ! xml-backend.lo ! libgconfbackend_bdb_la_DEPENDENCIES = ! libgconfbackend_bdb_la_OBJECTS = bdb.lo bdb-backend.lo val-encode.lo \ ! dir-utils.lo ! libgconfbackend_markup_la_DEPENDENCIES = ! libgconfbackend_markup_la_OBJECTS = markup-backend.lo markup-tree.lo ! noinst_PROGRAMS = xml-test$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! xml_test_OBJECTS = xml-cache.$(OBJEXT) xml-dir.$(OBJEXT) \ ! xml-entry.$(OBJEXT) xml-backend.$(OBJEXT) xml-test.$(OBJEXT) ! xml_test_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! xml_test_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 = $(libgconfbackend_xml_la_SOURCES) $(libgconfbackend_bdb_la_SOURCES) $(libgconfbackend_markup_la_SOURCES) $(xml_test_SOURCES) - OBJECTS = $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_bdb_la_OBJECTS) $(libgconfbackend_markup_la_OBJECTS) $(xml_test_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 backends/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! ! ! mostlyclean-backendLTLIBRARIES: ! ! clean-backendLTLIBRARIES: ! -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) ! distclean-backendLTLIBRARIES: ! maintainer-clean-backendLTLIBRARIES: install-backendLTLIBRARIES: $(backend_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(backenddir) @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(backenddir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(backenddir)/$$p; \ else :; fi; \ done uninstall-backendLTLIBRARIES: @$(NORMAL_UNINSTALL) ! list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ done ! mostlyclean-noinstLTLIBRARIES: clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) ! distclean-noinstLTLIBRARIES: ! ! maintainer-clean-noinstLTLIBRARIES: ! ! .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: ! ! libgconfbackend-xml.la: $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_xml_la_DEPENDENCIES) ! $(LINK) -rpath $(backenddir) $(libgconfbackend_xml_la_LDFLAGS) $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_xml_la_LIBADD) $(LIBS) ! ! libgconfbackend-bdb.la: $(libgconfbackend_bdb_la_OBJECTS) $(libgconfbackend_bdb_la_DEPENDENCIES) ! $(LINK) -rpath $(backenddir) $(libgconfbackend_bdb_la_LDFLAGS) $(libgconfbackend_bdb_la_OBJECTS) $(libgconfbackend_bdb_la_LIBADD) $(LIBS) ! ! libgconfbackend-markup.la: $(libgconfbackend_markup_la_OBJECTS) $(libgconfbackend_markup_la_DEPENDENCIES) ! $(LINK) $(libgconfbackend_markup_la_LDFLAGS) $(libgconfbackend_markup_la_OBJECTS) $(libgconfbackend_markup_la_LIBADD) $(LIBS) ! ! mostlyclean-noinstPROGRAMS: ! ! clean-noinstPROGRAMS: ! -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! ! distclean-noinstPROGRAMS: ! maintainer-clean-noinstPROGRAMS: ! xml-test$(EXEEXT): $(xml_test_OBJECTS) $(xml_test_DEPENDENCIES) ! @rm -f xml-test$(EXEEXT) ! $(LINK) $(xml_test_LDFLAGS) $(xml_test_OBJECTS) $(xml_test_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 = backends 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 - markup-backend.lo markup-backend.o : markup-backend.c \ - ../gconf/gconf-backend.h ../gconf/gconf-internals.h ../config.h \ - ../gconf/gconf-error.h ../gconf/gconf-value.h \ - ../gconf/gconf-engine.h ../gconf/gconf-sources.h \ - ../gconf/GConfX.h ../gconf/gconf.h ../gconf/gconf-schema.h \ - ../gconf/gconf-enum-types.h markup-tree.h - markup-tree.lo markup-tree.o : markup-tree.c ../gconf/gconf-internals.h \ - ../config.h ../gconf/gconf-error.h ../gconf/gconf-value.h \ - ../gconf/gconf-engine.h ../gconf/gconf-sources.h \ - ../gconf/GConfX.h ../gconf/gconf-schema.h markup-tree.h - xml-backend.o: xml-backend.c ../gconf/gconf-backend.h \ - ../gconf/gconf-internals.h ../config.h ../gconf/gconf-error.h \ - ../gconf/gconf-value.h ../gconf/gconf-engine.h \ - ../gconf/gconf-sources.h ../gconf/GConfX.h ../gconf/gconf.h \ - ../gconf/gconf-schema.h ../gconf/gconf-enum-types.h xml-cache.h \ - xml-dir.h - xml-cache.o: xml-cache.c xml-cache.h ../gconf/gconf.h \ - ../gconf/gconf-schema.h ../gconf/gconf-value.h \ - ../gconf/gconf-error.h ../gconf/gconf-engine.h \ - ../gconf/gconf-enum-types.h xml-dir.h \ - ../gconf/gconf-internals.h ../config.h ../gconf/gconf-sources.h \ - ../gconf/GConfX.h - xml-dir.o: xml-dir.c xml-dir.h ../gconf/gconf.h ../gconf/gconf-schema.h \ - ../gconf/gconf-value.h ../gconf/gconf-error.h \ - ../gconf/gconf-engine.h ../gconf/gconf-enum-types.h xml-entry.h \ - ../gconf/gconf-internals.h ../config.h ../gconf/gconf-sources.h \ - ../gconf/GConfX.h - xml-entry.o: xml-entry.c xml-entry.h ../gconf/gconf.h \ - ../gconf/gconf-schema.h ../gconf/gconf-value.h \ - ../gconf/gconf-error.h ../gconf/gconf-engine.h \ - ../gconf/gconf-enum-types.h ../gconf/gconf-internals.h \ - ../config.h ../gconf/gconf-sources.h ../gconf/GConfX.h - xml-test.o: xml-test.c xml-entry.h ../gconf/gconf.h \ - ../gconf/gconf-schema.h ../gconf/gconf-value.h \ - ../gconf/gconf-error.h ../gconf/gconf-engine.h \ - ../gconf/gconf-enum-types.h xml-dir.h xml-cache.h \ - ../gconf/gconf-internals.h ../config.h ../gconf/gconf-sources.h \ - ../gconf/GConfX.h ../gconf/gconf-backend.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-backendLTLIBRARIES ! install-data: install-data-am - install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am ! uninstall-am: uninstall-backendLTLIBRARIES uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(backenddir) 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-backendLTLIBRARIES \ ! mostlyclean-noinstLTLIBRARIES mostlyclean-compile \ ! mostlyclean-libtool mostlyclean-noinstPROGRAMS \ ! mostlyclean-tags mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-backendLTLIBRARIES clean-noinstLTLIBRARIES \ ! clean-compile clean-libtool clean-noinstPROGRAMS \ ! clean-tags clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-backendLTLIBRARIES distclean-noinstLTLIBRARIES \ ! distclean-compile distclean-libtool \ ! distclean-noinstPROGRAMS distclean-tags \ ! distclean-generic clean-am ! -rm -f libtool ! distclean: distclean-am ! maintainer-clean-am: maintainer-clean-backendLTLIBRARIES \ ! maintainer-clean-noinstLTLIBRARIES \ ! 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-backendLTLIBRARIES distclean-backendLTLIBRARIES \ ! clean-backendLTLIBRARIES maintainer-clean-backendLTLIBRARIES \ ! uninstall-backendLTLIBRARIES install-backendLTLIBRARIES \ ! mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \ ! clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \ ! 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 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. --- 129,440 ---- USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ + am__include = @am__include@ + am__quote = @am__quote@ gconflocaledir = @gconflocaledir@ + install_sh = @install_sh@ l = @l@ ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \ ! $(DEPENDENT_WITH_XML_CFLAGS) $(BDB_CFLAGS) \ ! -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\" EXTRA_DIST = README.bdb backenddir = $(pkglibdir)/$(MAJOR_VERSION) + @BDB_TRUE@BDBBACKEND = libgconfbackend-bdb.la @BDB_FALSE@BDBBACKEND = backend_LTLIBRARIES = libgconfbackend-xml.la $(BDBBACKEND) noinst_LTLIBRARIES = libgconfbackend-markup.la ! libgconfbackend_xml_la_SOURCES = \ ! xml-cache.h \ ! xml-cache.c \ ! xml-dir.h \ ! xml-dir.c \ ! xml-entry.h \ ! xml-entry.c \ ! xml-backend.c libgconfbackend_xml_la_LDFLAGS = -avoid-version -module ! libgconfbackend_xml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) ../gconf/libgconf-$(MAJOR_VERSION).la libgconfbackend_bdb_la_SOURCES = bdb.c bdb.h bdb-backend.c val-encode.c val-encode.h dir-utils.c dir-utils.h libgconfbackend_bdb_la_LDFLAGS = -avoid-version -module libgconfbackend_bdb_la_LIBADD = $(DEPENDENT_LIBS) $(BDB_LIBS) ! libgconfbackend_markup_la_SOURCES = \ ! markup-backend.c \ ! markup-tree.h \ ! markup-tree.c libgconfbackend_markup_la_LDFLAGS = -avoid-version -module ! libgconfbackend_markup_la_LIBADD = $(DEPENDENT_LIBS) ../gconf/libgconf-$(MAJOR_VERSION).la noinst_PROGRAMS = xml-test xml_test_SOURCES = $(libgconfbackend_xml_la_SOURCES) xml-test.c xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la + subdir = backends mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! LTLIBRARIES = $(backend_LTLIBRARIES) $(noinst_LTLIBRARIES) ! ! libgconfbackend_bdb_la_DEPENDENCIES = ! am_libgconfbackend_bdb_la_OBJECTS = bdb.lo bdb-backend.lo val-encode.lo \ ! dir-utils.lo ! libgconfbackend_bdb_la_OBJECTS = $(am_libgconfbackend_bdb_la_OBJECTS) ! libgconfbackend_markup_la_DEPENDENCIES = \ ! ../gconf/libgconf-$(MAJOR_VERSION).la ! am_libgconfbackend_markup_la_OBJECTS = markup-backend.lo markup-tree.lo ! libgconfbackend_markup_la_OBJECTS = \ ! $(am_libgconfbackend_markup_la_OBJECTS) ! libgconfbackend_xml_la_DEPENDENCIES = \ ! ../gconf/libgconf-$(MAJOR_VERSION).la ! am_libgconfbackend_xml_la_OBJECTS = xml-cache.lo xml-dir.lo xml-entry.lo \ ! xml-backend.lo ! libgconfbackend_xml_la_OBJECTS = $(am_libgconfbackend_xml_la_OBJECTS) ! noinst_PROGRAMS = xml-test$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! am_xml_test_OBJECTS = xml-cache.$(OBJEXT) xml-dir.$(OBJEXT) \ ! xml-entry.$(OBJEXT) xml-backend.$(OBJEXT) xml-test.$(OBJEXT) ! xml_test_OBJECTS = $(am_xml_test_OBJECTS) ! xml_test_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! xml_test_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = ! 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 = $(libgconfbackend_bdb_la_SOURCES) \ ! $(libgconfbackend_markup_la_SOURCES) \ ! $(libgconfbackend_xml_la_SOURCES) $(xml_test_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in ! SOURCES = $(libgconfbackend_bdb_la_SOURCES) $(libgconfbackend_markup_la_SOURCES) $(libgconfbackend_xml_la_SOURCES) $(xml_test_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps backends/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status install-backendLTLIBRARIES: $(backend_LTLIBRARIES) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(backenddir) @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(backenddir)/$$p; \ else :; fi; \ done uninstall-backendLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(backend_LTLIBRARIES)'; for p in $$list; do \ ! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p"; \ ! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(backenddir)/$$p; \ done ! clean-backendLTLIBRARIES: ! -test -z "$(backend_LTLIBRARIES)" || rm -f $(backend_LTLIBRARIES) clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + libgconfbackend-bdb.la: $(libgconfbackend_bdb_la_OBJECTS) $(libgconfbackend_bdb_la_DEPENDENCIES) + $(LINK) -rpath $(backenddir) $(libgconfbackend_bdb_la_LDFLAGS) $(libgconfbackend_bdb_la_OBJECTS) $(libgconfbackend_bdb_la_LIBADD) $(LIBS) + libgconfbackend-markup.la: $(libgconfbackend_markup_la_OBJECTS) $(libgconfbackend_markup_la_DEPENDENCIES) + $(LINK) $(libgconfbackend_markup_la_LDFLAGS) $(libgconfbackend_markup_la_OBJECTS) $(libgconfbackend_markup_la_LIBADD) $(LIBS) + libgconfbackend-xml.la: $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_xml_la_DEPENDENCIES) + $(LINK) -rpath $(backenddir) $(libgconfbackend_xml_la_LDFLAGS) $(libgconfbackend_xml_la_OBJECTS) $(libgconfbackend_xml_la_LIBADD) $(LIBS) ! clean-noinstPROGRAMS: ! -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! xml-test$(EXEEXT): $(xml_test_OBJECTS) $(xml_test_DEPENDENCIES) ! @rm -f xml-test$(EXEEXT) ! $(LINK) $(xml_test_LDFLAGS) $(xml_test_OBJECTS) $(xml_test_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 `cygpath -w $<` ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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 $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || 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) ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(backenddir) 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)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* 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-backendLTLIBRARIES clean-generic clean-libtool \ ! clean-noinstLTLIBRARIES 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-backendLTLIBRARIES ! ! 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 ! ! uninstall-am: uninstall-backendLTLIBRARIES uninstall-info-am + .PHONY: GTAGS all all-am check check-am clean clean-backendLTLIBRARIES \ + clean-generic clean-libtool clean-noinstLTLIBRARIES \ + clean-noinstPROGRAMS distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am info info-am install install-am \ + install-backendLTLIBRARIES 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 tags uninstall uninstall-am \ + uninstall-backendLTLIBRARIES 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 ./GConf/config.guess /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/config.guess *** ./GConf/config.guess Tue Jan 21 04:29:18 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/config.guess Sat Aug 9 21:08:51 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 Free Software Foundation, Inc. ! timestamp='2002-10-21' # 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,127 **** 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. ! # This shell variable is my proudest work .. or something. --bje ! ! set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; ! (old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) ! || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; ! dummy=$tmpdir/dummy ; ! files="$dummy.c $dummy.o $dummy.rel $dummy" ; ! trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; ! 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 ; ! rm -f $files ; 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 ; ! unset files' # 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) *************** *** 138,167 **** 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 *************** *** 184,228 **** # 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 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` --- 172,177 ---- *************** *** 231,237 **** # 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 ---- *************** *** 257,265 **** 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" ;; *************** *** 281,292 **** 2-1307) UNAME_MACHINE="alphaev68" ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; esac fi ! rm -f $dummy.s $dummy && rmdir $tmpdir 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*:*) *************** *** 301,311 **** 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 *************** *** 327,336 **** 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 ---- *************** *** 359,365 **** 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) *************** *** 373,378 **** --- 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 *************** *** 399,404 **** --- 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 ;; *************** *** 437,457 **** exit (-1); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c \ ! && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ ! && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir 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) - 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 ;; *************** *** 524,531 **** exit(0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir 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 *************** *** 534,540 **** 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 *************** *** 574,581 **** 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 *************** *** 584,596 **** 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 *************** *** 623,632 **** exit (0); } EOF ! (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` ! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi ! rm -f $dummy.c $dummy && rmdir $tmpdir ! fi ;; esac echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; --- 597,606 ---- 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 ;; *************** *** 661,668 **** exit (0); } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir 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:*:* ) *************** *** 690,695 **** --- 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 ;; *************** *** 708,713 **** --- 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 ;; *************** *** 729,740 **** --- 709,726 ---- 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 ;; *************** *** 745,763 **** 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=` ! rm -f $dummy.c && rmdir $tmpdir ! 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 *************** *** 768,776 **** i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - 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 --- 745,750 ---- *************** *** 796,825 **** 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=` ! rm -f $dummy.c && rmdir $tmpdir ! test x"${CPU}" != x && echo "${CPU}-pc-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 *************** *** 868,875 **** # 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: *// *************** *** 881,887 **** ;; 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 ;; *************** *** 893,921 **** 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=` ! rm -f $dummy.c && rmdir $tmpdir ! 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*:*) *************** *** 953,965 **** 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 --- 915,927 ---- 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 *************** *** 992,1003 **** # "miniframe" echo m68010-convergent-sysv exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-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 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*: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` *************** *** 1088,1096 **** 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 ---- *************** *** 1101,1117 **** echo `uname -p`-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:*:*) --- 1057,1071 ---- 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:*:*) *************** *** 1283,1290 **** } EOF ! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 ! rm -f $dummy.c $dummy && rmdir $tmpdir # 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 ./GConf/config.sub /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/config.sub *** ./GConf/config.sub Tue Jan 21 04:29:18 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/config.sub Sat Aug 9 21:08:51 2003 *************** *** 1,9 **** #! /bin/sh # Configuration validation subroutine script. ! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, ! # 2000, 2001, 2002 Free Software Foundation, Inc. ! timestamp='2002-09-05' # 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* | storm-chaos* | os2-emx* | windows32-* | 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,268 **** 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 \ ! | mipsisa64 | mipsisa64el \ ! | mipsisa64sb1 | mipsisa64sb1el \ ! | mipsisa64sr71k | mipsisa64sr71kel \ ! | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | ns16k | ns32k \ ! | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ ! | 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 ;; *************** *** 289,339 **** 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-* \ ! | mipsisa64-* | mipsisa64el-* \ ! | mipsisa64sb1-* | mipsisa64sb1el-* \ ! | mipsisa64sr71k-* | mipsisa64sr71kel-* \ ! | mipstx39 | mipstx39el \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ ! | 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-*) ;; *************** *** 398,407 **** basic_machine=ns32k-sequent os=-dynix ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; convex-c1) basic_machine=c1-convex os=-bsd --- 374,379 ---- *************** *** 422,429 **** 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) *************** *** 438,451 **** 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 ---- *************** *** 626,631 **** --- 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/'` ;; *************** *** 640,649 **** basic_machine=m68k-rom68k os=-coff ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; msdos) basic_machine=i386-pc os=-msdos --- 620,625 ---- *************** *** 723,732 **** 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 ---- *************** *** 749,767 **** 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-*) *************** *** 776,797 **** 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/^[^-]*-//'` ;; *************** *** 812,833 **** rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; sa29200) basic_machine=a29k-amd os=-udi ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; sequent) basic_machine=i386-sequent ;; --- 784,793 ---- *************** *** 835,841 **** 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 ;; *************** *** 901,922 **** basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; 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 --- 861,870 ---- basic_machine=i386-sequent 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 *************** *** 981,993 **** basic_machine=i386-pc os=-windows32-msvcrt ;; ! xps | xps100) ! basic_machine=xps100-honeywell ! ;; ! ymp) ! basic_machine=ymp-cray os=-unicos ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim --- 925,937 ---- 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 *************** *** 1008,1013 **** --- 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 ;; *************** *** 1027,1042 **** 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) *************** *** 1051,1056 **** --- 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. ;; *************** *** 1116,1123 **** | -interix* | -uwin* | -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*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) --- 1068,1074 ---- | -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*) *************** *** 1169,1188 **** -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 *************** *** 1221,1228 **** -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) ;; *************** *** 1255,1265 **** 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-*) *************** *** 1286,1294 **** mips*-*) os=-elf ;; - or32-*) - os=-coff - ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; --- 1230,1235 ---- *************** *** 1352,1370 **** *-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) *************** *** 1436,1442 **** -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) --- 1377,1383 ---- -ptx*) vendor=sequent ;; ! -vxsim* | -vxworks*) vendor=wrs ;; -aux*) diff -crN ./GConf/configure /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/configure *** ./GConf/configure Tue Jan 21 04:29:24 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/configure Sat Aug 9 21:09:21 2003 *************** *** 1,11 **** #! /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. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## --- 1,178 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.53. # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. + + # Find the correct PATH separator. Usually this is `:', but + # DJGPP uses `;' like DOS. + if test "X${PATH_SEPARATOR+set}" != Xset; then + UNAME=${UNAME-`uname 2>/dev/null`} + case X$UNAME in + *-DOS) lt_cv_sys_path_separator=';' ;; + *) lt_cv_sys_path_separator=':' ;; + esac + PATH_SEPARATOR=$lt_cv_sys_path_separator + fi + + + # Check that we are running under the correct shell. + SHELL=${CONFIG_SHELL-/bin/sh} + + case X$ECHO in + X*--fallback-echo) + # Remove one level of quotation (which was required for Make). + ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` + ;; + esac + + echo=${ECHO-echo} + if test "X$1" = X--no-reexec; then + # Discard the --no-reexec flag, and continue. + shift + elif test "X$1" = X--fallback-echo; then + # Avoid inline document here, it may be left over + : + elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then + # Yippee, $echo works! + : + else + # Restart under the correct shell. + exec $SHELL "$0" --no-reexec ${1+"$@"} + fi + + if test "X$1" = X--fallback-echo; then + # used as fallback echo + shift + cat </dev/null && + echo_test_string="`eval $cmd`" && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done + fi + + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : + else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. + + IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$save_ifs" + + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL $0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL $0 --fallback-echo" + else + # maybe with a smaller string... + prev=: + + for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break + fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "$0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi + fi + fi + fi + fi + fi + + # Copy echo and quote the copy suitably for passing to libtool from + # the Makefile, instead of quoting the original, which is used later. + ECHO=$echo + if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" + fi + + + + if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr + else + as_expr=false + fi + + ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## *************** *** 14,26 **** if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset --- 181,191 ---- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi + # NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset *************** *** 28,69 **** as_unset=false fi ! ! # Work around bugs in pre-3.0 UWIN ksh. ! $as_unset ENV MAIL MAILPATH ! PS1='$ ' ! PS2='> ' ! 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 ! else ! $as_unset $as_var ! fi ! done ! ! # Required to use basename. ! if expr a : '\(a\)' >/dev/null 2>&1; then ! as_expr=expr ! else ! as_expr=false ! fi ! ! if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ! as_basename=basename ! else ! as_basename=false ! fi # Name of the executable. ! as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ --- 193,226 ---- as_unset=false fi ! (set +x; test -n "`(LANG=C; export LANG) 2>&1`") && ! { $as_unset LANG || test "${LANG+set}" != set; } || ! { LANG=C; export LANG; } ! (set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && ! { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || ! { LC_ALL=C; export LC_ALL; } ! (set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && ! { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || ! { LC_TIME=C; export LC_TIME; } ! (set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && ! { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || ! { LC_CTYPE=C; export LC_CTYPE; } ! (set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && ! { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || ! { LANGUAGE=C; export LANGUAGE; } ! (set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && ! { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || ! { LC_COLLATE=C; export LC_COLLATE; } ! (set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && ! { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || ! { LC_NUMERIC=C; export LC_NUMERIC; } ! (set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && ! { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || ! { LC_MESSAGES=C; export LC_MESSAGES; } # Name of the executable. ! as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ *************** *** 74,80 **** /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' --- 231,236 ---- *************** *** 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 --- 241,255 ---- # 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=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conftest.sh fi *************** *** 141,148 **** as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} --- 297,302 ---- *************** *** 215,226 **** fi rm -f conf$$ conf$$.exe conf$$.file - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: - else - as_mkdir_p=false - fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. --- 369,374 ---- *************** *** 237,402 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH ! ! ! # Find the correct PATH separator. Usually this is `:', but ! # DJGPP uses `;' like DOS. ! if test "X${PATH_SEPARATOR+set}" != Xset; then ! UNAME=${UNAME-`uname 2>/dev/null`} ! case X$UNAME in ! *-DOS) lt_cv_sys_path_separator=';' ;; ! *) lt_cv_sys_path_separator=':' ;; ! esac ! PATH_SEPARATOR=$lt_cv_sys_path_separator ! fi ! ! ! # Check that we are running under the correct shell. ! SHELL=${CONFIG_SHELL-/bin/sh} ! ! case X$ECHO in ! X*--fallback-echo) ! # Remove one level of quotation (which was required for Make). ! ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` ! ;; ! esac ! ! echo=${ECHO-echo} ! if test "X$1" = X--no-reexec; then ! # Discard the --no-reexec flag, and continue. ! shift ! elif test "X$1" = X--fallback-echo; then ! # Avoid inline document here, it may be left over ! : ! elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then ! # Yippee, $echo works! ! : ! else ! # Restart under the correct shell. ! exec $SHELL "$0" --no-reexec ${1+"$@"} ! fi ! ! if test "X$1" = X--fallback-echo; then ! # used as fallback echo ! shift ! cat </dev/null && ! echo_test_string="`eval $cmd`" && ! (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null ! then ! break ! fi ! done ! fi ! ! if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ! echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! : ! else ! # The Solaris, AIX, and Digital Unix default echo programs unquote ! # backslashes. This makes it impossible to quote backslashes using ! # echo "$something" | sed 's/\\/\\\\/g' ! # ! # So, first we look for a working echo in the user's PATH. ! ! IFS="${IFS= }"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR ! for dir in $PATH /usr/ucb; do ! if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ! test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ! echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! echo="$dir/echo" ! break ! fi ! done ! IFS="$save_ifs" ! ! if test "X$echo" = Xecho; then ! # We didn't find a better echo, so look for alternatives. ! if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && ! echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! # This shell has a builtin print -r that does the trick. ! echo='print -r' ! elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && ! test "X$CONFIG_SHELL" != X/bin/ksh; then ! # If we have ksh, try running configure again with it. ! ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ! export ORIGINAL_CONFIG_SHELL ! CONFIG_SHELL=/bin/ksh ! export CONFIG_SHELL ! exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} ! else ! # Try using printf. ! echo='printf %s\n' ! if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && ! echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! # Cool, printf works ! : ! elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ! test "X$echo_testing_string" = 'X\t' && ! echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ! export CONFIG_SHELL ! SHELL="$CONFIG_SHELL" ! export SHELL ! echo="$CONFIG_SHELL $0 --fallback-echo" ! elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && ! test "X$echo_testing_string" = 'X\t' && ! echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && ! test "X$echo_testing_string" = "X$echo_test_string"; then ! echo="$CONFIG_SHELL $0 --fallback-echo" ! else ! # maybe with a smaller string... ! prev=: ! ! for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do ! if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null ! then ! break ! fi ! prev="$cmd" ! done ! ! if test "$prev" != 'sed 50q "$0"'; then ! echo_test_string=`eval $prev` ! export echo_test_string ! exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} ! else ! # Oops. We lost completely, so just stick with echo. ! echo=echo ! fi ! fi ! fi ! fi ! fi ! fi ! ! # Copy echo and quote the copy suitably for passing to libtool from ! # the Makefile, instead of quoting the original, which is used later. ! ECHO=$echo ! if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then ! ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" ! fi ! # Name of the host. --- 385,391 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } # Name of the host. *************** *** 410,416 **** # Initializations. # ac_default_prefix=/usr/local - ac_config_libobj_dir=. cross_compiling=no subdirs= MFLAGS= --- 399,404 ---- *************** *** 467,474 **** # 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP 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 LIBTOOL MAJOR_VERSION GETTEXT_PACKAGE GCONF_CURRENT GCONF_REVISION GCONF_AGE EXPANDED_SYSCONFDIR GCONF_CONFIG_SOURCE INSTALL_GCONF_CONFIG_SOURCE HTML_DIR GTKDOC HAVE_GTK_DOC_TRUE HAVE_GTK_DOC_FALSE HAVE_GTK_DOC DB2HTML HAVE_DOCBOOK_TRUE HAVE_DOCBOOK_FALSE ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE PKG_CONFIG DEPENDENT_CFLAGS DEPENDENT_LIBS DEPENDENT_WITH_XML_CFLAGS DEPENDENT_WITH_XML_LIBS DEPENDENT_WITH_GTK_CFLAGS DEPENDENT_WITH_GTK_LIBS DEPENDENT_WITH_XML_AND_GTK_CFLAGS DEPENDENT_WITH_XML_AND_GTK_LIBS GTK_TRUE GTK_FALSE BDB_TRUE BDB_FALSE BDB_LIBS BDB_CFLAGS ORBIT_IDL POPT_LIBS PTHREADS_TRUE PTHREADS_FALSE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gconflocaledir absolute_top_srcdir AWK PERL INDENT REBUILD LIBOBJS LTLIBOBJS' - ac_subst_files='' # Initialize some variables set by options. ac_init_help= --- 455,460 ---- *************** *** 892,900 **** { (exit 1); exit 1; }; } fi fi - (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` ac_env_build_alias_set=${build_alias+set} ac_env_build_alias_value=$build_alias --- 878,883 ---- *************** *** 1015,1020 **** --- 998,1005 ---- Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-shared=PKGS build shared libraries default=yes *************** *** 1085,1091 **** # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` --- 1070,1076 ---- # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` *************** *** 1125,1131 **** 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 $@ --- 1110,1116 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ *************** *** 1177,1230 **** # 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 --- 1162,1188 ---- # 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 ! case " $ac_configure_args " in ! *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. ! *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" ! ac_sep=" " ;; ! esac ! # Get rid of the leading space. done # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there *************** *** 1235,1241 **** # Save into config.log some information that might help in debugging. { echo - cat <<\_ASBOX ## ---------------- ## ## Cache variables. ## --- 1193,1198 ---- *************** *** 1258,1292 **** esac; } echo - - cat <<\_ASBOX - ## ----------------- ## - ## Output variables. ## - ## ----------------- ## - _ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX - ## ------------- ## - ## Output files. ## - ## ------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - if test -s confdefs.h; then cat <<\_ASBOX ## ----------- ## --- 1215,1220 ---- *************** *** 1294,1300 **** ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && --- 1222,1228 ---- ## ----------- ## _ASBOX echo ! sed "/^$/d" confdefs.h echo fi test "$ac_signal" != 0 && *************** *** 1454,1465 **** - 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 --- 1382,1391 ---- ! ac_config_headers="$ac_config_headers config.h" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then *************** *** 1566,1585 **** 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 --- 1492,1512 ---- 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 *************** *** 1592,1598 **** { (exit 1); exit 1; }; } fi ! test "$2" = conftestfile ) then # Ok. --- 1519,1525 ---- { (exit 1); exit 1; }; } fi ! test "$2" = conftest.file ) then # Ok. *************** *** 1604,1610 **** 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 && --- 1531,1536 ---- *************** *** 1620,1634 **** 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=` --- 1546,1615 ---- 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=`CDPATH=:; 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= ! am_backtick='`' ! { echo "$as_me:$LINENO: WARNING: ${am_backtick}missing' script is too old or missing" >&5 ! echo "$as_me: WARNING: ${am_backtick}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=` *************** *** 1649,1665 **** SET_MAKE="MAKE=${MAKE-make}" fi ! PACKAGE=GConf ! ! VERSION=2.2.0 ! ! 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 --- 1630,1680 ---- SET_MAKE="MAKE=${MAKE-make}" fi + # 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 + + + + + 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 + ! # test to see if srcdir already configured ! if test "`CDPATH=:; 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 + # Define the identity of the package. + PACKAGE=GConf + VERSION=2.2.0 + cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" _ACEOF *************** *** 1670,1753 **** _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 echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 --- 1685,1728 ---- _ACEOF + # Autoconf 2.50 wants to disallow AM_ names. We explicitly allow + # the ones we care about. ! # Autoconf 2.50 always computes EXEEXT. However we need to be ! # compatible with 2.13, for now. So we always define EXEEXT, but we ! # don't compute it. ! ! # Similar for OBJEXT -- only we only use OBJEXT if the user actually ! # requests that it be used. This is a bit dumb. ! : ${OBJEXT=o} ! ! ! # Some tools Automake needs. ! ! ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal"} ! ! ! AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} ! ! ! AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} + 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"} + + INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" + + # We need awk for the "check" target. The system "awk" is bad on + # some platforms. + echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6 *************** *** 1977,1983 **** # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift ! ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi --- 1952,1960 ---- # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift ! set dummy "$as_dir/$ac_word" ${1+"$@"} ! shift ! ac_cv_prog_CC="$@" fi fi fi *************** *** 2082,2091 **** 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. --- 2059,2066 ---- 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. *************** *** 2110,2121 **** 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 () { --- 2085,2098 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2125,2131 **** } _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. --- 2102,2108 ---- } _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. *************** *** 2144,2182 **** # 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 --- 2121,2146 ---- # 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 `ls a_out.exe a.exe conftest.exe 2>/dev/null; ! ls a.out conftest 2>/dev/null; ! ls a.* conftest.* 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; ! 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" >&5 ! echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi *************** *** 2203,2213 **** 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 --- 2167,2175 ---- 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 *************** *** 2215,2221 **** 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. --- 2177,2183 ---- 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. *************** *** 2235,2244 **** # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. ! for ac_file in conftest.exe conftest conftest.*; do ! test -f "$ac_file" || continue case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; --- 2197,2205 ---- # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with # `rm'. ! for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` export ac_cv_exeext break;; *************** *** 2246,2255 **** 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 --- 2207,2214 ---- 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 *************** *** 2267,2278 **** 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 () { --- 2226,2239 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2289,2307 **** (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac 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 --- 2250,2265 ---- (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in ! *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac 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 *************** *** 2318,2329 **** 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 () { --- 2276,2289 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2350,2357 **** 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 --- 2310,2316 ---- 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 *************** *** 2371,2382 **** 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 () { --- 2330,2343 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2400,2407 **** 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 --- 2361,2367 ---- 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 *************** *** 2423,2524 **** CFLAGS= fi fi - echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 - echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 - if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_prog_cc_stdc=no - 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 - #include - /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ - struct buf { int x; }; - FILE * (*rcsopen) (struct buf *, struct stat *, int); - static char *e (p, i) - char **p; - int i; - { - return p[i]; - } - static char *f (char * (*g) (char **, int), char **p, ...) - { - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; - } - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; - int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); - int argc; - char **argv; - int - main () - { - return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; - } - _ACEOF - # Don't try gcc -ansi; that turns off useful extensions and - # breaks some systems' header files. - # AIX -qlanglvl=ansi - # Ultrix and OSF/1 -std1 - # HP-UX 10.20 and later -Ae - # HP-UX older versions -Aa -D_HPUX_SOURCE - # SVR4 -Xc -D__EXTENSIONS__ - for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" - 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_prog_cc_stdc=$ac_arg - break - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f conftest.$ac_objext - done - rm -f conftest.$ac_ext conftest.$ac_objext - CC=$ac_save_CC - - fi - - case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 - echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 - echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; - esac - # Some people use a C++ compiler to compile C. Since we use `exit', # in C++ we need to declare it. In case someone uses the same compiler # for both compiling C and C++ we need to have the C++ compiler decide --- 2383,2388 ---- *************** *** 2551,2563 **** 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 main () { --- 2415,2429 ---- do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include $ac_declaration + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2581,2599 **** : 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 () { --- 2447,2466 ---- : 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 + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2617,2624 **** 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 --- 2484,2490 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 2631,2638 **** 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 --- 2497,2503 ---- 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 *************** *** 2641,2646 **** --- 2506,2621 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_config_commands="$ac_config_commands default-1" + + 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 | fgrep -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 + + + 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 conftest.c -o conftest.o >/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" + + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' *************** *** 2761,2772 **** 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 () { --- 2736,2749 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2793,2800 **** 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 --- 2770,2776 ---- 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 *************** *** 2814,2825 **** 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 () { --- 2790,2803 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2843,2850 **** ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext --- 2821,2827 ---- ac_cv_prog_cxx_g=yes else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 ac_cv_prog_cxx_g=no fi rm -f conftest.$ac_objext conftest.$ac_ext *************** *** 2877,2889 **** 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 main () { --- 2854,2868 ---- do cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include $ac_declaration + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2907,2925 **** : 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 () { --- 2886,2905 ---- : 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 + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 2943,2950 **** 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 --- 2923,2929 ---- break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 2961,2966 **** --- 2940,3014 ---- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + depcc="$CXX" 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_CXX_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_CXX_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 conftest.c -o conftest.o >/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_CXX_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir + else + am_cv_CXX_dependencies_compiler_type=none + fi + + fi + echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 + echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6 + CXXDEPMODE="depmode=$am_cv_CXX_dependencies_compiler_type" + + echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 *************** *** 2972,2982 **** 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 --- 3020,3026 ---- 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 *************** *** 2985,2990 **** --- 3029,3040 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strerror (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 3008,3015 **** 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 --- 3058,3064 ---- 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 *************** *** 3037,3054 **** # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 ! # HP-UX -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" 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 --- 3086,3100 ---- # breaks some systems' header files. # AIX -qlanglvl=ansi # Ultrix and OSF/1 -std1 ! # HP-UX 10.20 and later -Ae ! # HP-UX older versions -Aa -D_HPUX_SOURCE # SVR4 -Xc -D__EXTENSIONS__ ! for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include #include #include *************** *** 3078,3083 **** --- 3124,3135 ---- int argc; char **argv; + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 3103,3110 **** am_cv_prog_cc_stdc="$ac_arg"; 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 --- 3155,3161 ---- am_cv_prog_cc_stdc="$ac_arg"; break else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext done *************** *** 3147,3174 **** 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 (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 --- 3198,3215 ---- 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 3185,3192 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 3226,3232 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 3196,3212 **** # 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 (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 --- 3236,3248 ---- # 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 3224,3231 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 3260,3266 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 3254,3281 **** 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 (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 --- 3289,3306 ---- 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 3292,3299 **** : else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Broken: fails on valid input. continue fi --- 3317,3323 ---- : else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Broken: fails on valid input. continue fi *************** *** 3303,3319 **** # 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 (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 --- 3327,3339 ---- # 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 3331,3338 **** continue else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! # Passes both tests. ac_preproc_ok=: break --- 3351,3357 ---- continue else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 # Passes both tests. ac_preproc_ok=: break *************** *** 3345,3354 **** 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 --- 3364,3371 ---- 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 *************** *** 3359,3379 **** ac_compiler_gnu=$ac_cv_c_compiler_gnu - echo "$as_me:$LINENO: checking for egrep" >&5 - echo $ECHO_N "checking for egrep... $ECHO_C" >&6 - if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi - fi - echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 - echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - echo "$as_me:$LINENO: checking for ANSI C header files" >&5 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 if test "${ac_cv_header_stdc+set}" = set; then --- 3376,3381 ---- *************** *** 3381,3439 **** 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 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 3383,3430 ---- 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=$? + egrep -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 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "memchr" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 3446,3461 **** # 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 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! $EGREP "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no --- 3437,3448 ---- # 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 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ! egrep "free" >/dev/null 2>&1; then : else ac_cv_header_stdc=no *************** *** 3471,3488 **** 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)) --- 3458,3470 ---- 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)) *************** *** 3515,3526 **** 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 ! rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi --- 3497,3507 ---- 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 ! rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi *************** *** 3797,3803 **** # 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" --- 3778,3800 ---- # 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" *************** *** 3817,3907 **** 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 --- 3814,3819 ---- *************** *** 3913,3920 **** 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 --- 3825,3832 ---- 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 *************** *** 3991,3999 **** 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" ;; --- 3903,3911 ---- 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" ;; *************** *** 4015,4021 **** # This must be Linux ELF. linux-gnu*) case $host_cpu in ! alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64*) lt_cv_deplibs_check_method=pass_all ;; *) # glibc up to 2.1.1 does not perform some relocations on ARM --- 3927,3933 ---- # 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 *************** *** 4086,4094 **** 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 --- 3998,4003 ---- *************** *** 4142,4153 **** 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]' ;; --- 4051,4059 ---- 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]' ;; *************** *** 4256,4262 **** (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" --- 4162,4168 ---- (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" *************** *** 4324,4334 **** 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> --- 4230,4236 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include <$ac_header> *************** *** 4348,4355 **** 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 --- 4250,4256 ---- 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 *************** *** 4384,4394 **** 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 --- 4285,4291 ---- 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 *************** *** 4407,4414 **** 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 --- 4304,4310 ---- 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 *************** *** 4420,4436 **** 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 (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 --- 4316,4328 ---- 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 4447,4454 **** 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 --- 4339,4345 ---- 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 *************** *** 4461,4492 **** { 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 --- 4352,4365 ---- { 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 *************** *** 4512,4518 **** - # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) --- 4385,4390 ---- *************** *** 4828,4834 **** case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4831 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? --- 4700,4706 ---- case $host in *-*-irix6*) # Find out which ABI we are using. ! echo '#line 4703 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? *************** *** 4868,4879 **** 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 () { --- 4740,4753 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 4897,4904 **** 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 --- 4771,4777 ---- 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 *************** *** 5070,5076 **** # 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*) --- 4943,4949 ---- # 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*) *************** *** 5113,5119 **** 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. --- 4986,4992 ---- 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. *************** *** 5157,5163 **** 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*) --- 5030,5040 ---- 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*) *************** *** 5197,5208 **** 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 () { --- 5074,5087 ---- CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 5241,5248 **** else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! lt_cv_prog_cc_pic_works=no fi --- 5120,5126 ---- else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 lt_cv_prog_cc_pic_works=no fi *************** *** 5285,5296 **** 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 () { --- 5163,5176 ---- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static" cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 5314,5321 **** 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" --- 5194,5200 ---- 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" *************** *** 5357,5363 **** save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:5360: \"$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 --- 5236,5242 ---- save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no ! if { (eval echo configure:5239: \"$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 *************** *** 5399,5410 **** 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 () { --- 5278,5291 ---- ac_objext=lo cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 5435,5442 **** 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" --- 5316,5322 ---- 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" *************** *** 5484,5495 **** 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 () { --- 5364,5377 ---- compiler_rtti_exceptions=no cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 5520,5527 **** 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" --- 5402,5408 ---- 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" *************** *** 5550,5555 **** --- 5431,5437 ---- 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 *************** *** 5693,5699 **** # 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; --- 5575,5581 ---- # 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; *************** *** 5702,5708 **** 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`; --- 5584,5589 ---- *************** *** 5754,5783 **** hardcode_shlibpath_var=no ;; - linux*) - if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - supports_anon_versioning=no - case `$LD -v 2>/dev/null` in - *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 - *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... - *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... - *\ 2.11.*) ;; # other 2.11 versions - *) supports_anon_versioning=yes ;; - esac - if test $supports_anon_versioning = yes; then - archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ - $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' - else - $archive_expsym_cmds="$archive_cmds" - fi - else - ld_shlibs=no - fi - ;; - *) if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' --- 5635,5640 ---- *************** *** 5831,5855 **** 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 --- 5688,5700 ---- 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 *************** *** 5884,5898 **** 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 --- 5729,5735 ---- 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 *************** *** 5902,5909 **** # 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' --- 5739,5746 ---- # 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' *************** *** 5916,5922 **** 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 ;; --- 5753,5759 ---- 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 ;; *************** *** 5958,5966 **** 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 --- 5795,5802 ---- 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 *************** *** 6012,6025 **** 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 ;; --- 5848,5860 ---- 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 ;; *************** *** 6047,6053 **** 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 --- 5882,5888 ---- 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 *************** *** 6057,6063 **** 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 --- 5892,5898 ---- 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 *************** *** 6169,6191 **** ;; 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 ;; --- 6004,6016 ---- ;; 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 ;; *************** *** 6333,6341 **** 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' --- 6158,6163 ---- *************** *** 6357,6380 **** 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*) --- 6179,6190 ---- 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*) *************** *** 6422,6428 **** ;; 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' --- 6232,6238 ---- ;; 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' *************** *** 6505,6521 **** 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= ;; *) --- 6315,6328 ---- 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= ;; *) *************** *** 6619,6630 **** 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*) --- 6426,6436 ---- 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*) *************** *** 6667,6678 **** 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 --- 6473,6478 ---- *************** *** 6738,6744 **** ;; aix4*) ! if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then test "$enable_shared" = yes && enable_static=no fi ;; --- 6538,6544 ---- ;; aix4*) ! if test "$host_cpu" != ia64 ; then test "$enable_shared" = yes && enable_static=no fi ;; *************** *** 6795,6838 **** 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; } --- 6595,6631 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 6852,6859 **** 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 --- 6645,6651 ---- 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 *************** *** 6872,6882 **** 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 --- 6664,6670 ---- 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 *************** *** 6885,6890 **** --- 6673,6684 ---- /* 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 (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 6908,6915 **** 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 --- 6702,6708 ---- 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 *************** *** 6927,6970 **** 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; } --- 6720,6756 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 6984,6991 **** 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 --- 6770,6776 ---- 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 *************** *** 7004,7014 **** 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 --- 6789,6795 ---- 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 *************** *** 7017,7022 **** --- 6798,6809 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 7040,7047 **** 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 --- 6827,6833 ---- 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 *************** *** 7061,7071 **** 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 --- 6847,6853 ---- 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 *************** *** 7074,7079 **** --- 6856,6867 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dlopen (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 7097,7104 **** 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 --- 6885,6891 ---- 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 *************** *** 7118,7128 **** 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 --- 6905,6911 ---- 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 *************** *** 7131,7136 **** --- 6914,6925 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dld_link (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 7154,7161 **** 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 --- 6943,6949 ---- 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 *************** *** 7213,7219 **** 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 <&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 --- 8561,8567 ---- 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 *************** *** 8795,8802 **** 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 --- 8580,8586 ---- 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 *************** *** 8808,8824 **** 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 (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 --- 8592,8604 ---- 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 8835,8842 **** 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 --- 8615,8621 ---- 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 *************** *** 8849,8880 **** { 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 --- 8628,8641 ---- { 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 *************** *** 8929,8939 **** 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 --- 8690,8696 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus *************** *** 8942,8947 **** --- 8699,8710 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char db_env_create (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 8965,8972 **** db3_libs="yes" else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! db3_libs="no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext --- 8728,8734 ---- db3_libs="yes" else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 db3_libs="no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext *************** *** 9027,9037 **** 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 --- 8789,8795 ---- 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 *************** *** 9040,9045 **** --- 8798,8809 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char poptGetArg (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 9063,9070 **** 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 --- 8827,8833 ---- 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 *************** *** 9089,9099 **** 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 --- 8852,8858 ---- 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 *************** *** 9112,9119 **** 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 --- 8871,8877 ---- 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 *************** *** 9125,9141 **** 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 (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 --- 8883,8895 ---- 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 9152,9159 **** 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 --- 8906,8912 ---- 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 *************** *** 9166,9197 **** { 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 --- 8919,8932 ---- { 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 *************** *** 9235,9245 **** echo $ECHO_N "checking pthread.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 --- 8970,8976 ---- echo $ECHO_N "checking pthread.h usability... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" $ac_includes_default #include _ACEOF *************** *** 9258,9265 **** 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 --- 8989,8995 ---- 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 *************** *** 9271,9287 **** echo $ECHO_N "checking pthread.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 (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 --- 9001,9013 ---- echo $ECHO_N "checking pthread.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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 9298,9305 **** 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 --- 9024,9030 ---- 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 *************** *** 9312,9343 **** { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: pthread.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: pthread.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: pthread.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 pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 --- 9037,9050 ---- { echo "$as_me:$LINENO: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&5 echo "$as_me: WARNING: pthread.h: accepted by the compiler, rejected by the preprocessor!" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};; no:yes ) { echo "$as_me:$LINENO: WARNING: pthread.h: present but cannot be compiled" >&5 echo "$as_me: WARNING: pthread.h: present but cannot be compiled" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: check for missing prerequisite headers?" >&5 echo "$as_me: WARNING: pthread.h: check for missing prerequisite headers?" >&2;} { echo "$as_me:$LINENO: WARNING: pthread.h: proceeding with the preprocessor's result" >&5 ! echo "$as_me: WARNING: pthread.h: proceeding with the preprocessor's result" >&2;};; esac echo "$as_me:$LINENO: checking for pthread.h" >&5 echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6 *************** *** 9376,9419 **** 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; } --- 9083,9119 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 9433,9440 **** 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 --- 9133,9139 ---- 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 *************** *** 9461,9504 **** 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; } --- 9160,9196 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 9518,9525 **** 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 --- 9210,9216 ---- 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 *************** *** 9556,9566 **** 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 --- 9247,9253 ---- 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 *************** *** 9579,9586 **** 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 --- 9266,9272 ---- 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 *************** *** 9592,9608 **** 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 (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 --- 9278,9290 ---- 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 9619,9626 **** 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 --- 9301,9307 ---- 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 *************** *** 9633,9664 **** { 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 --- 9314,9327 ---- { 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 *************** *** 9688,9699 **** 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 () { --- 9351,9364 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 9717,9724 **** 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 --- 9382,9388 ---- 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 *************** *** 9756,9766 **** 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 --- 9420,9426 ---- 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 *************** *** 9779,9786 **** 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 --- 9439,9445 ---- 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 *************** *** 9792,9808 **** 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 (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 --- 9451,9463 ---- 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 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? ! egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 *************** *** 9819,9826 **** 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 --- 9474,9480 ---- 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 *************** *** 9833,9864 **** { 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 --- 9487,9500 ---- { 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 *************** *** 9885,9898 **** 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 () { --- 9521,9536 ---- else cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" #include + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 9916,9923 **** 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 --- 9554,9560 ---- 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 *************** *** 9938,9981 **** 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; } --- 9575,9611 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 9995,10002 **** 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 --- 9625,9631 ---- 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 *************** *** 10028,10038 **** 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 --- 9657,9663 ---- 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 *************** *** 10041,10046 **** --- 9666,9677 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char bindtextdomain (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 10064,10071 **** 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 --- 9695,9701 ---- 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 *************** *** 10083,10093 **** 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 --- 9713,9719 ---- 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 *************** *** 10096,10101 **** --- 9722,9733 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dgettext (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 10119,10126 **** 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 --- 9751,9757 ---- 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 *************** *** 10149,10159 **** 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 --- 9780,9786 ---- 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 *************** *** 10162,10167 **** --- 9789,9800 ---- /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dcgettext (); + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 10185,10192 **** 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 --- 9818,9824 ---- 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 *************** *** 10223,10266 **** 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; } --- 9855,9891 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 10280,10287 **** 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 --- 9905,9911 ---- 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 *************** *** 10370,10413 **** 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; } --- 9994,10030 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 10427,10434 **** 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 --- 10044,10050 ---- 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 *************** *** 10521,10532 **** 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 () { --- 10137,10150 ---- cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" ! #include "confdefs.h" + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif int main () { *************** *** 10552,10564 **** DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! CATOBJEXT=.mo DATADIRNAME=lib fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext INSTOBJEXT=.mo fi fi --- 10170,10183 ---- DATADIRNAME=share else echo "$as_me: failed program was:" >&5 ! cat conftest.$ac_ext >&5 CATOBJEXT=.mo DATADIRNAME=lib fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext INSTOBJEXT=.mo + else + gt_cv_have_gettext=no fi fi *************** *** 10587,10593 **** # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-2" for lang in $ALL_LINGUAS; do --- 10206,10212 ---- # We need to process the po/ directory. POSUB=po ! ac_config_commands="$ac_config_commands default-2" for lang in $ALL_LINGUAS; do *************** *** 10669,10712 **** 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; } --- 10288,10324 ---- 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) (); + + #ifdef F77_DUMMY_MAIN + # ifdef __cplusplus + extern "C" + # endif + int F77_DUMMY_MAIN() { return 1; } + #endif + 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; } *************** *** 10726,10733 **** 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 --- 10338,10344 ---- 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 *************** *** 10891,10897 **** fi ! ac_config_files="$ac_config_files Makefile gconf.spec gconf.m4 gconf/Makefile gconf/default.path backends/Makefile po/Makefile.in doc/Makefile doc/gconf/Makefile examples/Makefile tests/Makefile gconf-2.0.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure --- 10502,10508 ---- fi ! ac_config_files="$ac_config_files Makefile gconf.spec gconf.m4 gconf/Makefile gconf/default.path backends/Makefile po/Makefile.in doc/Makefile doc/gconf/Makefile examples/Makefile tests/Makefile gconf-2.0.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure *************** *** 10902,10908 **** # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # ! # `ac_cv_env_foo' variables (set or unset) will be overridden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. --- 10513,10519 ---- # config.status only pays attention to the cache file if you give it # the --recheck option to rerun configure. # ! # `ac_cv_env_foo' variables (set or unset) will be overriden when # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. *************** *** 10937,10943 **** 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 --- 10548,10554 ---- 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 *************** *** 10968,10988 **** DEFS=-DHAVE_CONFIG_H - ac_libobjs= - ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - - LTLIBOBJS=$ac_ltlibobjs - - : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files --- 10579,10584 ---- *************** *** 10997,11008 **** # configure, is in config.log if it exists. debug=false - ac_cs_recheck=false - ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## --- 10593,10603 ---- # configure, is in config.log if it exists. debug=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF + ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## *************** *** 11011,11023 **** if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset --- 10606,10616 ---- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then set -o posix fi + # NLS nuisances. # Support unset when possible. if (FOO=FOO; unset FOO) >/dev/null 2>&1; then as_unset=unset *************** *** 11025,11066 **** as_unset=false fi ! ! # Work around bugs in pre-3.0 UWIN ksh. ! $as_unset ENV MAIL MAILPATH ! PS1='$ ' ! PS2='> ' ! 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 ! else ! $as_unset $as_var ! fi ! done ! ! # Required to use basename. ! if expr a : '\(a\)' >/dev/null 2>&1; then ! as_expr=expr ! else ! as_expr=false ! fi ! ! if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then ! as_basename=basename ! else ! as_basename=false ! fi # Name of the executable. ! as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ --- 10618,10651 ---- as_unset=false fi ! (set +x; test -n "`(LANG=C; export LANG) 2>&1`") && ! { $as_unset LANG || test "${LANG+set}" != set; } || ! { LANG=C; export LANG; } ! (set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && ! { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || ! { LC_ALL=C; export LC_ALL; } ! (set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && ! { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || ! { LC_TIME=C; export LC_TIME; } ! (set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && ! { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || ! { LC_CTYPE=C; export LC_CTYPE; } ! (set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && ! { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || ! { LANGUAGE=C; export LANGUAGE; } ! (set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && ! { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || ! { LC_COLLATE=C; export LC_COLLATE; } ! (set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && ! { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || ! { LC_NUMERIC=C; export LC_NUMERIC; } ! (set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && ! { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || ! { LC_MESSAGES=C; export LC_MESSAGES; } # Name of the executable. ! as_me=`(basename "$0") 2>/dev/null || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)$' \| \ *************** *** 11071,11077 **** /^X\/\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - # PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' --- 10656,10661 ---- *************** *** 11082,11096 **** # 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 --- 10666,10680 ---- # 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=".;."; conftest.sh) >/dev/null 2>&1; then PATH_SEPARATOR=';' else PATH_SEPARATOR=: fi ! rm -f conftest.sh fi *************** *** 11139,11146 **** as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` test "x$as_lineno_1" != "x$as_lineno_2" && test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } CONFIG_SHELL=$as_dir/$as_base export CONFIG_SHELL exec "$CONFIG_SHELL" "$0" ${1+"$@"} --- 10723,10728 ---- *************** *** 11214,11225 **** fi rm -f conf$$ conf$$.exe conf$$.file - if mkdir -p . 2>/dev/null; then - as_mkdir_p=: - else - as_mkdir_p=false - fi - as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. --- 10796,10801 ---- *************** *** 11236,11242 **** IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH exec 6>&1 --- 10812,10818 ---- IFS=" $as_nl" # CDPATH. ! $as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } exec 6>&1 *************** *** 11253,11259 **** 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 --- 10829,10835 ---- cat >&5 <<_CSEOF This file was extended by $as_me, which was ! generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 11293,11299 **** -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] --- 10869,10874 ---- *************** *** 11316,11322 **** 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 --- 10891,10897 ---- cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 *************** *** 11337,11361 **** --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ! ac_shift=: ! ;; ! -*) ! ac_option=$1 ! ac_optarg=$2 ! ac_shift=shift ;; *) # This is not an option, so the user has probably given explicit # arguments. - ac_option=$1 ac_need_defaults=false;; esac ! 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) --- 10912,10936 ---- --*=*) ac_option=`expr "x$1" : 'x\([^=]*\)='` ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ! shift ! set dummy "$ac_option" "$ac_optarg" ${1+"$@"} ! shift ;; + -*);; *) # This is not an option, so the user has probably given explicit # arguments. ac_need_defaults=false;; esac ! case $1 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) *************** *** 11370,11385 **** --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) ! $ac_shift ! CONFIG_FILES="$CONFIG_FILES $ac_optarg" ac_need_defaults=false;; --header | --heade | --head | --hea ) ! $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 --- 10945,10957 ---- --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) ! shift ! CONFIG_FILES="$CONFIG_FILES $1" ac_need_defaults=false;; --header | --heade | --head | --hea ) ! shift ! CONFIG_HEADERS="$CONFIG_HEADERS $1" ac_need_defaults=false;; # This is an error. -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 *************** *** 11394,11413 **** 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 --- 10966,10971 ---- *************** *** 11415,11421 **** # INIT-COMMANDS section. # ! _ACEOF --- 10973,10980 ---- # INIT-COMMANDS section. # ! AMDEP_TRUE="$AMDEP_TRUE" ! ac_aux_dir="$ac_aux_dir" _ACEOF *************** *** 11458,11466 **** 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 || { --- 11017,11022 ---- *************** *** 11469,11485 **** } # 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; } } --- 11025,11041 ---- } # 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; } } *************** *** 11532,11543 **** --- 11088,11109 ---- s,@INSTALL_DATA@,$INSTALL_DATA,;t t s,@PACKAGE@,$PACKAGE,;t t s,@VERSION@,$VERSION,;t t + s,@EXEEXT@,$EXEEXT,;t t + s,@OBJEXT@,$OBJEXT,;t t s,@ACLOCAL@,$ACLOCAL,;t t s,@AUTOCONF@,$AUTOCONF,;t t 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,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t + s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t + s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t + s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t + s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t + s,@DEPDIR@,$DEPDIR,;t t s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t s,@MAINT@,$MAINT,;t t *************** *** 11546,11558 **** s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t ! s,@EXEEXT@,$EXEEXT,;t t ! s,@OBJEXT@,$OBJEXT,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t s,@CPP@,$CPP,;t t - s,@EGREP@,$EGREP,;t t s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t --- 11112,11125 ---- s,@LDFLAGS@,$LDFLAGS,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@ac_ct_CC@,$ac_ct_CC,;t t ! s,@am__include@,$am__include,;t t ! s,@am__quote@,$am__quote,;t t ! s,@CCDEPMODE@,$CCDEPMODE,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t s,@ac_ct_CXX@,$ac_ct_CXX,;t t + s,@CXXDEPMODE@,$CXXDEPMODE,;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 *************** *** 11622,11633 **** s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t s,@gconflocaledir@,$gconflocaledir,;t t s,@absolute_top_srcdir@,$absolute_top_srcdir,;t t - s,@AWK@,$AWK,;t t s,@PERL@,$PERL,;t t s,@INDENT@,$INDENT,;t t s,@REBUILD@,$REBUILD,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF _ACEOF --- 11189,11197 ---- *************** *** 11698,11727 **** /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { if $as_mkdir_p; then ! mkdir -p "$ac_dir" ! else ! as_dir="$ac_dir" ! 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 \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; }; } ac_builddir=. --- 11262,11286 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { case "$ac_dir" in ! [\\/]* | ?:[\\/]* ) as_incr_dir=;; ! *) as_incr_dir=.;; ! esac ! as_dummy="$ac_dir" ! for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do ! case $as_mkdir_dir in ! # Skip DOS drivespec ! ?:) as_incr_dir=$as_mkdir_dir ;; ! *) ! as_incr_dir=$as_incr_dir/$as_mkdir_dir ! test -d "$as_incr_dir" || ! mkdir "$as_incr_dir" || ! { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; } ! ;; ! esac ! done; } ac_builddir=. *************** *** 11751,11757 **** # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` --- 11310,11316 ---- # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` *************** *** 11941,11947 **** # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS ! echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail --- 11500,11506 ---- # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS ! echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS echo ' :' >>$CONFIG_STATUS rm -f conftest.tail *************** *** 11965,11971 **** mv conftest.tail conftest.defines done rm -f conftest.defines ! echo ' fi # grep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size --- 11524,11530 ---- mv conftest.tail conftest.defines done rm -f conftest.defines ! echo ' fi # egrep' >>$CONFIG_STATUS echo >>$CONFIG_STATUS # Break up conftest.undefs because some shells have a limit on the size *************** *** 12005,12011 **** 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 --- 11564,11570 ---- 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 *************** *** 12021,12050 **** /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { if $as_mkdir_p; then ! mkdir -p "$ac_dir" ! else ! as_dir="$ac_dir" ! 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 \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; }; } rm -f $ac_file mv $tmp/config.h $ac_file --- 11580,11604 ---- /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` ! { case "$ac_dir" in ! [\\/]* | ?:[\\/]* ) as_incr_dir=;; ! *) as_incr_dir=.;; ! esac ! as_dummy="$ac_dir" ! for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do ! case $as_mkdir_dir in ! # Skip DOS drivespec ! ?:) as_incr_dir=$as_mkdir_dir ;; ! *) ! as_incr_dir=$as_incr_dir/$as_mkdir_dir ! test -d "$as_incr_dir" || ! mkdir "$as_incr_dir" || ! { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 ! echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} ! { (exit 1); exit 1; }; } ! ;; ! esac ! done; } rm -f $ac_file mv $tmp/config.h $ac_file *************** *** 12053,12058 **** --- 11607,11618 ---- cat $tmp/config.h rm -f $tmp/config.h fi + # Run the commands associated with the file. + case $ac_file in + config.h ) # update the timestamp + echo timestamp >"./stamp-h1" + ;; + esac done _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF *************** *** 12103,12109 **** # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` --- 11663,11669 ---- # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be # absolute. ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` ! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` *************** *** 12111,12117 **** { 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 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; --- 11671,11715 ---- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 echo "$as_me: executing $ac_dest commands" >&6;} case $ac_dest in ! default-1 ) ! test x"$AMDEP_TRUE" != x"" || ! for mf in $CONFIG_FILES; do ! case "$mf" in ! Makefile) dirpart=.;; ! */Makefile) dirpart=`echo "$mf" | sed -e 's|/[^/]*$||'`;; ! *) continue;; ! esac ! 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=`echo "$file" | sed -e 's|/[^/]*$||'` ! $ac_aux_dir/mkinstalldirs "$dirpart/$fdir" > /dev/null 2>&1 ! # echo "creating $dirpart/$file" ! echo '# dummy' > "$dirpart/$file" ! done ! done ! ;; default-2 ) case "$CONFIG_FILES" in *po/Makefile.in*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile esac ;; *************** *** 12137,12147 **** # 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. --- 11735,11742 ---- # 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 ./GConf/doc/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/Makefile.in *** ./GConf/doc/Makefile.in Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/Makefile.in Sat Aug 9 21:09: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,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** 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 = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ BDB_CFLAGS = @BDB_CFLAGS@ *************** *** 72,77 **** --- 71,77 ---- CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ + DEPDIR = @DEPDIR@ DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ DEPENDENT_LIBS = @DEPENDENT_LIBS@ DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ *************** *** 100,105 **** --- 100,106 ---- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INDENT = @INDENT@ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ *************** *** 109,115 **** LN_S = @LN_S@ MAINT = @MAINT@ MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 110,115 ---- *************** *** 129,135 **** --- 129,138 ---- USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ + am__include = @am__include@ + am__quote = @am__quote@ gconflocaledir = @gconflocaledir@ + install_sh = @install_sh@ l = @l@ SUBDIRS = gconf *************** *** 137,183 **** SchemasDTD_DATA = gconf-1.0.dtd SchemasDTDdir = $(datadir)/sgml/gconf ! EXTRA_DIST = $(SchemasDTD_DATA) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! DATA = $(SchemasDTD_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 doc/Makefile ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status install-SchemasDTDDATA: $(SchemasDTD_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(SchemasDTDdir) @list='$(SchemasDTD_DATA)'; for p in $$list; do \ ! if test -f $(srcdir)/$$p; then \ ! echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(SchemasDTDdir)/$$p"; \ ! $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(SchemasDTDdir)/$$p; \ ! else if test -f $$p; then \ ! echo " $(INSTALL_DATA) $$p $(DESTDIR)$(SchemasDTDdir)/$$p"; \ ! $(INSTALL_DATA) $$p $(DESTDIR)$(SchemasDTDdir)/$$p; \ ! fi; fi; \ done uninstall-SchemasDTDDATA: @$(NORMAL_UNINSTALL) ! list='$(SchemasDTD_DATA)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(SchemasDTDdir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd --- 140,199 ---- SchemasDTD_DATA = gconf-1.0.dtd SchemasDTDdir = $(datadir)/sgml/gconf ! EXTRA_DIST = \ ! $(SchemasDTD_DATA) + subdir = doc mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! DIST_SOURCES = ! DATA = $(SchemasDTD_DATA) ! RECURSIVE_TARGETS = info-recursive dvi-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: ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(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) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + uninstall-info-am: install-SchemasDTDDATA: $(SchemasDTD_DATA) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(SchemasDTDdir) @list='$(SchemasDTD_DATA)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(SchemasDTDdir)/$$f"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(SchemasDTDdir)/$$f; \ done uninstall-SchemasDTDDATA: @$(NORMAL_UNINSTALL) ! @list='$(SchemasDTD_DATA)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(SchemasDTDdir)/$$f"; \ ! rm -f $(DESTDIR)$(SchemasDTDdir)/$$f; \ done # This directory's subdirectories are mostly independent; you can cd *************** *** 186,197 **** # (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//`; \ --- 202,208 ---- # (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//`; \ *************** *** 214,224 **** 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"; \ --- 225,240 ---- 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"; \ *************** *** 237,287 **** 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 = 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 for subdir in $(SUBDIRS); do \ --- 253,312 ---- tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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 $(LISP) ! 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) $(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)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || exit 1; \ else \ test -f $(distdir)/$$file \ ! || cp -p $$d/$$file $(distdir)/$$file \ ! || exit 1; \ fi; \ done for subdir in $(SUBDIRS); do \ *************** *** 289,369 **** 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-SchemasDTDDATA install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - install: install-recursive - uninstall-am: uninstall-SchemasDTDDATA - 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)$(SchemasDTDdir) - 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-SchemasDTDDATA install-SchemasDTDDATA \ ! 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 # 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. --- 314,411 ---- 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)$(SchemasDTDdir) ! 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)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* 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-SchemasDTDDATA ! ! 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 ! ! uninstall-am: uninstall-SchemasDTDDATA uninstall-info-am ! ! uninstall-info: uninstall-info-recursive + .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-libtool clean-recursive distclean \ + distclean-generic distclean-libtool distclean-recursive \ + distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ + info-recursive install install-SchemasDTDDATA 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-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 tags tags-recursive \ + uninstall uninstall-SchemasDTDDATA uninstall-am \ + uninstall-info-am uninstall-info-recursive 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 ./GConf/doc/gconf/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/Makefile.in *** ./GConf/doc/gconf/Makefile.in Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/Makefile.in Sat Aug 9 21:09: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,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,17 **** # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! # The name of the module. SHELL = @SHELL@ --- 11,19 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. ! @SET_MAKE@ + # The name of the module. SHELL = @SHELL@ *************** *** 33,45 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ --- 35,43 ---- *************** *** 48,58 **** 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 = : --- 46,56 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 61,66 **** --- 59,65 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ BDB_CFLAGS = @BDB_CFLAGS@ *************** *** 74,79 **** --- 73,79 ---- CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ + DEPDIR = @DEPDIR@ DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ DEPENDENT_LIBS = @DEPENDENT_LIBS@ DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ *************** *** 102,107 **** --- 102,108 ---- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INDENT = @INDENT@ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ *************** *** 111,117 **** LN_S = @LN_S@ MAINT = @MAINT@ MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 112,117 ---- *************** *** 131,137 **** --- 131,140 ---- USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ + am__include = @am__include@ + am__quote = @am__quote@ gconflocaledir = @gconflocaledir@ + install_sh = @install_sh@ l = @l@ DOC_MODULE = gconf *************** *** 172,178 **** # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. ! GTKDOC_CFLAGS = -I$(top_srcdir) $(CFLAGS) $(DEPENDENT_CFLAGS) GTKDOC_LIBS = $(LDFLAGS) $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la --- 175,182 ---- # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. ! GTKDOC_CPPFLAGS = -I$(top_srcdir) @CPPFLAGS@ ! GTKDOC_CFLAGS = $(DEPENDENT_CFLAGS) GTKDOC_LIBS = $(LDFLAGS) $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la *************** *** 192,305 **** TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) ! EXTRA_DIST = $(content_files) $(extra_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) $(DOC_MODULE).types $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt ! ! ! DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ! ! ! SCANOBJ_FILES = $(DOC_MODULE).args $(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/gconf/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/gconf 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 @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp --- 196,350 ---- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) ! EXTRA_DIST = \ ! $(content_files) \ ! $(extra_files) \ ! $(HTML_IMAGES) \ ! $(DOC_MAIN_SGML_FILE) \ ! $(DOC_MODULE).types \ ! $(DOC_MODULE)-sections.txt \ ! $(DOC_MODULE)-overrides.txt ! ! ! DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ ! $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp ! ! ! SCANOBJ_FILES = \ ! $(DOC_MODULE).args \ ! $(DOC_MODULE).hierarchy \ ! $(DOC_MODULE).signals + subdir = doc/gconf mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! depcomp = ! DIST_SOURCES = ! DIST_COMMON = Makefile.am Makefile.in ! all: all-am .SUFFIXES: ! mostlyclean-libtool: ! -rm -f *.lo + clean-libtool: + -rm -rf .libs _libs + + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps doc/gconf/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + uninstall-info-am: tags: TAGS TAGS: ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = ../.. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || 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)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* 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 ! ! 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 uninstall uninstall-am uninstall-info-am @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp *************** *** 309,315 **** @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) @ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ ! @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(OBJSCAN_OPTIONS); \ @ENABLE_GTK_DOC_TRUE@ else \ @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) ; \ @ENABLE_GTK_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ --- 354,360 ---- @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) @ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ ! @ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CPPFLAGS) $(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj --module=$(DOC_MODULE) --output-dir=$(srcdir) $(OBJSCAN_OPTIONS); \ @ENABLE_GTK_DOC_TRUE@ else \ @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) ; \ @ENABLE_GTK_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ *************** *** 395,401 **** -cp $(srcdir)/html/* $(distdir)/html .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: --- 440,445 ---- diff -crN ./GConf/doc/gconf/sgml/gconf-backend.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-backend.sgml *** ./GConf/doc/gconf/sgml/gconf-backend.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-backend.sgml Sat Aug 9 21:12:04 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + *************** *** 33,38 **** --- 34,41 ---- + + Description *************** *** 45,50 **** --- 48,54 ---- <anchor id="GConfBackendVTable">struct GConfBackendVTable struct GConfBackendVTable { + void (* shutdown) (GError** err); GConfSource* (* resolve_address) (const gchar* address, *************** *** 359,364 **** --- 363,369 ---- <anchor id="GConfBackend">struct GConfBackend struct GConfBackend { + const gchar* name; guint refcount; GConfBackendVTable* vtable; *************** *** 373,481 **** gchar* gconf_address_backend (const gchar *address); ! ! ! ! ! ! address : ! ! ! Returns : ! ! <anchor id="gconf-address-resource">gconf_address_resource () gchar* gconf_address_resource (const gchar *address); ! ! ! ! ! ! address : ! ! ! Returns : ! ! <anchor id="gconf-backend-file">gconf_backend_file () gchar* gconf_backend_file (const gchar *address); ! ! ! ! ! ! address : ! ! ! Returns : ! ! <anchor id="gconf-get-backend">gconf_get_backend () GConfBackend* gconf_get_backend (const gchar *address, GError **err); ! ! ! ! ! ! address : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-backend-ref">gconf_backend_ref () void gconf_backend_ref (GConfBackend *backend); ! ! ! ! ! ! backend : ! ! ! <anchor id="gconf-backend-unref">gconf_backend_unref () void gconf_backend_unref (GConfBackend *backend); ! ! ! ! ! ! backend : ! ! ! <anchor id="gconf-backend-resolve-address">gconf_backend_resolve_address () GConfSource* gconf_backend_resolve_address (GConfBackend *backend, --- 378,462 ---- gchar* gconf_address_backend (const gchar *address); ! ! address : ! ! ! Returns : ! ! <anchor id="gconf-address-resource">gconf_address_resource () gchar* gconf_address_resource (const gchar *address); ! ! address : ! ! ! Returns : ! ! <anchor id="gconf-backend-file">gconf_backend_file () gchar* gconf_backend_file (const gchar *address); ! ! address : ! ! ! Returns : ! ! <anchor id="gconf-get-backend">gconf_get_backend () GConfBackend* gconf_get_backend (const gchar *address, GError **err); ! ! address : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-backend-ref">gconf_backend_ref () void gconf_backend_ref (GConfBackend *backend); ! ! backend : ! ! ! <anchor id="gconf-backend-unref">gconf_backend_unref () void gconf_backend_unref (GConfBackend *backend); ! ! backend : ! ! ! <anchor id="gconf-backend-resolve-address">gconf_backend_resolve_address () GConfSource* gconf_backend_resolve_address (GConfBackend *backend, *************** *** 483,507 **** GError **err); ! ! ! ! ! ! backend : ! ! ! address : ! ! ! err : ! ! ! Returns : ! ! --- 464,484 ---- GError **err); ! ! backend : ! ! ! address : ! ! ! err : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-changeset.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-changeset.sgml *** ./GConf/doc/gconf/sgml/gconf-changeset.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-changeset.sgml Sat Aug 9 21:12:05 2003 *************** *** 1,16 **** ! GConfChangeSet 3 GCONF Library ! GConfChangeSet ! a set of configuration changes to be made. Synopsis --- 1,16 ---- ! gconf-changeset 3 GCONF Library ! gconf-changeset Synopsis + *************** *** 90,115 **** Description - a GConfChangeSet allows you to collect a set of changes to - configuration keys (set/unset operations). You can then commit - all the changes at once. This is convenient for something like a - preferences dialog; you can collect all the pending changes in a - GConfChangeSet, then when the user clicks "apply" send them all to - the configuration database. The GConfChangeSet allows you to avoid - sending every preferences setting when "apply" is clicked; you only - have to send the settings the user changed. - - - In the future, GConf may also have optimizations so that - changing a group of values with GConfChangeSet is faster than calling - gconf_engine_set() for each value. In the future, GConfChangeSet may also - represent an atomic transaction, where all or none of the values are - set; however, for now the operation is not - atomic. --- 90,101 ---- + + Description *************** *** 119,126 **** <anchor id="GConfChangeSet">struct GConfChangeSet struct GConfChangeSet; ! An opaque data type representing a set of changes to be made. ! A change set can contain "set" and "unset" operations. <anchor id="GConfChangeSetForeachFunc">GConfChangeSetForeachFunc () --- 105,111 ---- <anchor id="GConfChangeSet">struct GConfChangeSet struct GConfChangeSet; ! <anchor id="GConfChangeSetForeachFunc">GConfChangeSetForeachFunc () *************** *** 129,159 **** GConfValue *value, gpointer user_data); - The type of a function passed to gconf_change_set_foreach(). - The cs argument is the GConfChangeSet you're iterating over. key is - a key in the change set. value is the value the key will be set to, - or NULL if the key will be unset. user_data is the - user data passed to gconf_change_set_foreach(). - - - - - - cs : - the GConfChangeSet being iterated over. - - key : - the current key. - - value : - the current value, or NULL. - - user_data : - user data passed to gconf_change_set_foreach(). ! ! <anchor id="gconf-engine-commit-change-set">gconf_engine_commit_change_set () gboolean gconf_engine_commit_change_set (GConfEngine *conf, --- 114,136 ---- GConfValue *value, gpointer user_data); + + cs : + + + key : + + + value : + + + user_data : + ! ! ! <anchor id="gconf-engine-commit-change-set">gconf_engine_commit_change_set () gboolean gconf_engine_commit_change_set (GConfEngine *conf, *************** *** 161,536 **** gboolean remove_committed, GError **err); - Applies the changes in the change set to the GConfEngine passed as - the first argument. If remove_committed is TRUE, - then any successfully-committed changes are removed from the change - set. If remove_committed is FALSE, the - GConfChangeSet is left unmodified. - ! ! If any set or unset operation results in an error, then processing ! terminates and the error is returned in err (unless err was ! NULL). If remove_committed was ! TRUE, then all the changes committed before the error ! occurred will have been removed from the set. If any error occurs, ! FALSE is returned. ! ! ! ! ! ! conf : ! a GConfEngine. ! ! cs : ! a GConfChangeSet. ! ! remove_committed : ! whether to remove successfully-committed changes from the set ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :TRUE on success, FALSE if an error occurs. ! ! <anchor id="gconf-change-set-new">gconf_change_set_new () GConfChangeSet* gconf_change_set_new (void); - Creates a new, empty GConfChangeSet. The caller assumes one reference - count, and must call gconf_change_set_unref() eventually. - - - - - - Returns :a new GConfChangeSet. ! ! <anchor id="gconf-change-set-ref">gconf_change_set_ref () void gconf_change_set_ref (GConfChangeSet *cs); ! Increases the reference count of a GConfChangeSet by one. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! <anchor id="gconf-change-set-unref">gconf_change_set_unref () void gconf_change_set_unref (GConfChangeSet *cs); ! Decreases the reference count of a GConfChangeSet by one. If the ! reference count reaches 0, destroys the GConfChangeSet. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! <anchor id="gconf-change-set-clear">gconf_change_set_clear () void gconf_change_set_clear (GConfChangeSet *cs); - Clears all changes from a GConfChangeSet, so that committing the - change set would have no effect. - - - - - - cs : - a GConfChangeSet. ! ! <anchor id="gconf-change-set-size">gconf_change_set_size () guint gconf_change_set_size (GConfChangeSet *cs); ! ! ! ! ! ! cs : ! ! ! Returns : ! ! <anchor id="gconf-change-set-remove">gconf_change_set_remove () void gconf_change_set_remove (GConfChangeSet *cs, const gchar *key); ! Removes a change from a GConfChangeSet. The key given as the key ! argument will not be modified if this change set is committed. ! If key is not in the change set, this function has no effect. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! key : ! key to remove from the change set. ! ! <anchor id="gconf-change-set-foreach">gconf_change_set_foreach () void gconf_change_set_foreach (GConfChangeSet *cs, GConfChangeSetForeachFunc func, gpointer user_data); ! Iterates over a GConfChangeSet by calling a ! GConfChangeSetForeachFunc for each change in the set. See the ! description of GConfChangeSetForeachFunc for details. You may not ! call gconf_change_set_remove() during the iteration, because you'll ! confuse the internal data structures and cause memory corruption. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! func : ! function to call for each change in the change set. ! ! user_data : ! user data to pass to the GConfChangeSetForeachFunc. ! ! <anchor id="gconf-change-set-set">gconf_change_set_set () void gconf_change_set_set (GConfChangeSet *cs, const gchar *key, GConfValue *value); - Adds a "set" operation to a change set. This function is similar to - gconf_engine_set(), except that no errors can occur (errors occur later, when - you try to commit the change set). - - - - - - cs : - a GConfChangeSet. - - key : - the key to change. - - value : - the value to change the key to. ! ! <anchor id="gconf-change-set-set-nocopy">gconf_change_set_set_nocopy () void gconf_change_set_set_nocopy (GConfChangeSet *cs, const gchar *key, GConfValue *value); ! Like gconf_change_set_set(), except that the GConfChangeSet takes ! ownership of the GConfValue. You should not use the value again. It ! will be destroyed when the change is removed from the GConfChangeSet, ! the change is modified, or the GConfChangeSet is destroyed. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! key : ! the key to change. ! ! value : ! the new value of key. ! ! <anchor id="gconf-change-set-unset">gconf_change_set_unset () void gconf_change_set_unset (GConfChangeSet *cs, const gchar *key); ! Adds an "unset" operation to a GConfChangeSet. This function ! schedules a gconf_engine_unset(). ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! key : ! the key to unset. ! ! <anchor id="gconf-change-set-set-float">gconf_change_set_set_float () void gconf_change_set_set_float (GConfChangeSet *cs, const gchar *key, gdouble val); - Adds a "set" operation; takes a gdouble argument, so you can avoid - creating a GConfValue. - - - - - - cs : - a GConfChangeSet. - - key : - the key to set. - - val : - the new value of key. ! ! <anchor id="gconf-change-set-set-int">gconf_change_set_set_int () void gconf_change_set_set_int (GConfChangeSet *cs, const gchar *key, gint val); ! Adds a "set" operation; takes a gint argument, so you can avoid ! creating a GConfValue. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! key : ! the key to set. ! ! val : ! the new value of key. ! ! <anchor id="gconf-change-set-set-string">gconf_change_set_set_string () void gconf_change_set_set_string (GConfChangeSet *cs, const gchar *key, const gchar *val); ! Adds a "set" operation; takes a gchar* argument, so you can avoid ! creating a GConfValue. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! key : ! the key to set. ! ! val : ! the new value of key. ! ! <anchor id="gconf-change-set-set-bool">gconf_change_set_set_bool () void gconf_change_set_set_bool (GConfChangeSet *cs, const gchar *key, gboolean val); - Adds a "set" operation; takes a gboolean argument, so you can avoid - creating a GConfValue. - - - - - - cs : - a GConfChangeSet. - - key : - the key to set. - - val : - the new value of key. ! ! <anchor id="gconf-change-set-set-schema">gconf_change_set_set_schema () void gconf_change_set_set_schema (GConfChangeSet *cs, const gchar *key, GConfSchema *val); ! Adds a "set" operation; takes a GConfSchema argument, so you can ! avoid creating a GConfValue. The schema is copied, val is left ! unmodified. ! ! ! ! ! ! cs : ! a GConfChangeSet. ! ! key : ! the key to set. ! ! val : ! the new value of key. ! ! <anchor id="gconf-change-set-set-list">gconf_change_set_set_list () void gconf_change_set_set_list (GConfChangeSet *cs, --- 138,415 ---- gboolean remove_committed, GError **err); ! ! conf : ! ! ! cs : ! ! ! remove_committed : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-change-set-new">gconf_change_set_new () GConfChangeSet* gconf_change_set_new (void); + + Returns : ! ! ! <anchor id="gconf-change-set-ref">gconf_change_set_ref () void gconf_change_set_ref (GConfChangeSet *cs); ! ! ! cs : ! ! ! <anchor id="gconf-change-set-unref">gconf_change_set_unref () void gconf_change_set_unref (GConfChangeSet *cs); ! ! ! cs : ! ! ! <anchor id="gconf-change-set-clear">gconf_change_set_clear () void gconf_change_set_clear (GConfChangeSet *cs); + + cs : + ! ! ! <anchor id="gconf-change-set-size">gconf_change_set_size () guint gconf_change_set_size (GConfChangeSet *cs); ! ! cs : ! ! ! Returns : ! ! <anchor id="gconf-change-set-remove">gconf_change_set_remove () void gconf_change_set_remove (GConfChangeSet *cs, const gchar *key); ! ! ! cs : ! ! ! key : ! ! ! <anchor id="gconf-change-set-foreach">gconf_change_set_foreach () void gconf_change_set_foreach (GConfChangeSet *cs, GConfChangeSetForeachFunc func, gpointer user_data); ! ! ! cs : ! ! ! func : ! ! ! user_data : ! ! ! <anchor id="gconf-change-set-set">gconf_change_set_set () void gconf_change_set_set (GConfChangeSet *cs, const gchar *key, GConfValue *value); + + cs : + + + key : + + + value : + ! ! ! <anchor id="gconf-change-set-set-nocopy">gconf_change_set_set_nocopy () void gconf_change_set_set_nocopy (GConfChangeSet *cs, const gchar *key, GConfValue *value); ! ! ! cs : ! ! ! key : ! ! ! value : ! ! ! <anchor id="gconf-change-set-unset">gconf_change_set_unset () void gconf_change_set_unset (GConfChangeSet *cs, const gchar *key); ! ! ! cs : ! ! ! key : ! ! ! <anchor id="gconf-change-set-set-float">gconf_change_set_set_float () void gconf_change_set_set_float (GConfChangeSet *cs, const gchar *key, gdouble val); + + cs : + + + key : + + + val : + ! ! ! <anchor id="gconf-change-set-set-int">gconf_change_set_set_int () void gconf_change_set_set_int (GConfChangeSet *cs, const gchar *key, gint val); ! ! ! cs : ! ! ! key : ! ! ! val : ! ! ! <anchor id="gconf-change-set-set-string">gconf_change_set_set_string () void gconf_change_set_set_string (GConfChangeSet *cs, const gchar *key, const gchar *val); ! ! ! cs : ! ! ! key : ! ! ! val : ! ! ! <anchor id="gconf-change-set-set-bool">gconf_change_set_set_bool () void gconf_change_set_set_bool (GConfChangeSet *cs, const gchar *key, gboolean val); + + cs : + + + key : + + + val : + ! ! ! <anchor id="gconf-change-set-set-schema">gconf_change_set_set_schema () void gconf_change_set_set_schema (GConfChangeSet *cs, const gchar *key, GConfSchema *val); ! ! ! cs : ! ! ! key : ! ! ! val : ! ! ! <anchor id="gconf-change-set-set-list">gconf_change_set_set_list () void gconf_change_set_set_list (GConfChangeSet *cs, *************** *** 539,564 **** GSList *list); ! ! ! ! ! ! cs : ! ! ! key : ! ! ! list_type : ! ! ! list : ! ! ! <anchor id="gconf-change-set-set-pair">gconf_change_set_set_pair () void gconf_change_set_set_pair (GConfChangeSet *cs, --- 418,439 ---- GSList *list); ! ! cs : ! ! ! key : ! ! ! list_type : ! ! ! list : ! ! ! <anchor id="gconf-change-set-set-pair">gconf_change_set_set_pair () void gconf_change_set_set_pair (GConfChangeSet *cs, *************** *** 569,600 **** gconstpointer address_of_cdr); ! ! ! ! ! ! cs : ! ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! <anchor id="gconf-change-set-check-value">gconf_change_set_check_value () gboolean gconf_change_set_check_value (GConfChangeSet *cs, --- 444,471 ---- gconstpointer address_of_cdr); ! ! cs : ! ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! <anchor id="gconf-change-set-check-value">gconf_change_set_check_value () gboolean gconf_change_set_check_value (GConfChangeSet *cs, *************** *** 602,626 **** GConfValue **value_retloc); ! ! ! ! ! ! cs : ! ! ! key : ! ! ! value_retloc : ! ! ! Returns : ! ! <anchor id="gconf-engine-change-set-from-currentv">gconf_engine_change_set_from_currentv () GConfChangeSet* gconf_engine_change_set_from_currentv --- 473,493 ---- GConfValue **value_retloc); ! ! cs : ! ! ! key : ! ! ! value_retloc : ! ! ! Returns : ! ! <anchor id="gconf-engine-change-set-from-currentv">gconf_engine_change_set_from_currentv () GConfChangeSet* gconf_engine_change_set_from_currentv *************** *** 629,653 **** GError **err); ! ! ! ! ! ! conf : ! ! ! keys : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-change-set-from-current">gconf_engine_change_set_from_current () GConfChangeSet* gconf_engine_change_set_from_current --- 496,516 ---- GError **err); ! ! conf : ! ! ! keys : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-change-set-from-current">gconf_engine_change_set_from_current () GConfChangeSet* gconf_engine_change_set_from_current *************** *** 657,684 **** ...); ! ! ! ! ! ! conf : ! ! ! err : ! ! ! first_key : ! ! ! ... : ! ! ! Returns : ! ! <anchor id="gconf-engine-reverse-change-set">gconf_engine_reverse_change_set () GConfChangeSet* gconf_engine_reverse_change_set --- 520,543 ---- ...); ! ! conf : ! ! ! err : ! ! ! first_key : ! ! ! ... : ! ! ! Returns : ! ! <anchor id="gconf-engine-reverse-change-set">gconf_engine_reverse_change_set () GConfChangeSet* gconf_engine_reverse_change_set *************** *** 687,711 **** GError **err); ! ! ! ! ! ! conf : ! ! ! cs : ! ! ! err : ! ! ! Returns : ! ! --- 546,566 ---- GError **err); ! ! conf : ! ! ! cs : ! ! ! err : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-client.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-client.sgml *** ./GConf/doc/gconf/sgml/gconf-client.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-client.sgml Sat Aug 9 21:12:03 2003 *************** *** 6,16 **** ! GConfClient ! GtkObject-based convenience wrapper Synopsis --- 6,16 ---- ! GConfClient Synopsis + *************** *** 174,286 **** - - Description - - GConfClient adds the following features to plain GConf: - - - - A client-side cache for a specified list of directories you're interested in. - You can "preload" entire directories into the cache, speeding things up even more. - - - - - Some automatic error handling, if you request it. - - - - - Signals when a value changes or an error occurs. - - - - - - - - If you use GConfClient, you should not use the underlying GConfEngine - directly, or you'll break things. This is why there's no - gconf_client_get_engine() function; in fact, if you create the GConfClient with - gconf_client_get_default(), there is no (legitimate) way to obtain a pointer to the - underlying GConfEngine. If you create a GConfClient from an existing engine, - you'll have to be disciplined enough to avoid using that engine directly. - - - This is all a white lie; some direct GConfEngine - operations are safe. But it's complicated to know which, and if an operation - isn't safe the resulting bugs will mangle the cache and cause weird bugs at an - indeterminate time in the future; you don't want to risk this - situation. - - - - - - - A GConfClient has a list of directories that it "watches." These directories - are optionally pre-loaded into the cache, and monitored in order to emit the - value_changed signal. The GConfClient can also be used to access directories - not in the list, but those directories won't be preloaded and the "value_changed" - signal won't be emitted for them. - - - - There are two error-related signals in GConfClient. The first is plain "error"; - it's emitted anytime an error occurs. The second is "unreturned_error"; this - signal is emitted if you pass NULL as the GError** to any - GConfClient function. The idea is that you can have a global error handler - attached to the "unreturned_error" signal; if you want to use this handler, you - don't need to use the normal GConf error handling mechanism. However, if you - ever need to handle errors for a specific function call, you can override the - global handler by passing a non-NULL GError** to the - function. If you want an error handler that's always - invoked, use the "error" signal. - - - - The "value_changed" signal is emitted whenever the server notifies your client - program that a value has changed in the GConf database. There's one problem with - this signal: the signal handler has to use strcmp() to determine whether the - changed value is the one it was interested in. If you are interested in lots of - values, then every time a value changes you'll be making lots of calls to - strcmp() and getting O(n) performance. gconf_client_notify_add() is a superior - interface in most cases for this reason. Note that calling gconf_client_set() - and its relatives will cause "value_changed" to be emitted, but "value_changed" - is also emitted if another process changes the value. - - - Most of the GConfClient interface mirrors the functions you'd use to manipulate - a GConfEngine (gconf_engine_get() and gconf_client_get(), for example). These should - all work just like the GConfEngine versions, except that they use the cache - from GConfClient and emit the GConfClient signals. - - As always with GConf, applications based on GConfClient should use a - model-controller-view architecture. Typically, this means that areas of your - application affected by a setting will monitor the relevant key and update - themselves when necessary. The preferences dialog will simply change keys, - allowing GConf to notify the rest of the application that changes have occurred. - Here the application proper is the "view," GConf is the "model", and the - preferences dialog is the "controller." In no case should you do this: - - gconf_client_set(client, key, value); - application_update_to_reflect_setting(); - - This breaks if a setting is changed outside your - application—or even from a different part of your application. - The correct way (in pseudo-code) is: - - /* At application startup */ - gconf_client_notify_add(client, key, application_update_to_reflect_setting, data); - /* From preferences dialog */ - gconf_client_set(client, key, value); - - See the example programs that come with GConf for more details. --- 174,185 ---- + + Description *************** *** 295,330 **** } GConfClientPreloadType; ! The GConfClientPreloadType is used to tell GConfClient how to preload one of ! its directories. As a rule of thumb, if you plan to get the value of almost all the ! keys in a directory, preloading that directory will probably enhance ! performance. If you plan to use only half the keys, preloading is likely a bad ! idea. GCONF_CLIENT_PRELOAD_NONE specifies that no preload occurs, ! GCONF_CLIENT_PRELOAD_ONELEVEL loads the immediate children of the directory, ! GCONF_CLIENT_PRELOAD_RECURSIVE loads all children of the ! directory and its subdirectories, recursively. ! ! ! ! ! ! ! GCONF_CLIENT_PRELOAD_NONE ! preload nothing. ! ! ! ! GCONF_CLIENT_PRELOAD_ONELEVEL ! preload immediate children of the directory. ! ! ! ! GCONF_CLIENT_PRELOAD_RECURSIVE ! recursively preload everything in and below the directory. ! ! ! ! <anchor id="GConfClientErrorHandlingMode">enum GConfClientErrorHandlingMode typedef enum { /*< prefix=GCONF_CLIENT >*/ --- 194,201 ---- } GConfClientPreloadType; ! ! <anchor id="GConfClientErrorHandlingMode">enum GConfClientErrorHandlingMode typedef enum { /*< prefix=GCONF_CLIENT >*/ *************** *** 334,368 **** } GConfClientErrorHandlingMode; ! GConfClientErrorHandlingMode is used to control GConfClient's default error ! handling. GConfClient can pop up a dialog in the default signal handler for ! "error" or "unreturned_error." You can specify that no errors are handled, only ! unreturned errors are handled, or all errors are handled with this enumeration. ! You can prevent specific errors from being handled automatically by stopping the ! signal emission before the default signal handler is called (see the GTK+ ! documentation, gtk_signal_emit_stop_by_name() for example). ! ! ! ! ! ! ! GCONF_CLIENT_HANDLE_NONE ! never run a default error handler. ! ! ! ! GCONF_CLIENT_HANDLE_UNRETURNED ! run a default error handler for unreturned errors ("unreturned_error" signal). ! ! ! ! GCONF_CLIENT_HANDLE_ALL ! run a default error handler for all errors ("error" signal). ! ! ! ! <anchor id="GConfClientNotifyFunc">GConfClientNotifyFunc () void (*GConfClientNotifyFunc) (GConfClient *client, --- 205,212 ---- } GConfClientErrorHandlingMode; ! ! <anchor id="GConfClientNotifyFunc">GConfClientNotifyFunc () void (*GConfClientNotifyFunc) (GConfClient *client, *************** *** 370,474 **** GConfEntry *entry, gpointer user_data); ! This is the signature of a user function added with gconf_client_notify_add(). ! The notify function is invoked when the value of a key changes. The value ! argument is the new value, or NULL if the key was unset. The ! value argument should not be modified, and should be copied if you want to keep ! it around (the GConfClient will destroy it sometime after your notify function ! is called). ! ! ! ! ! ! client : ! the GConfClient notifying us. ! ! cnxn_id : ! connection ID from gconf_client_notify_add(). ! ! entry : ! ! ! user_data : ! user data from gconf_client_notify_add(). ! ! <anchor id="GConfClientErrorHandlerFunc">GConfClientErrorHandlerFunc () void (*GConfClientErrorHandlerFunc) (GConfClient *client, GError *error); ! ! ! ! ! ! client : ! ! ! error : ! ! ! <anchor id="GCONF-CLIENT-CAPS">GCONF_CLIENT() #define GCONF_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCONF_TYPE_CLIENT, GConfClient)) ! Casts a pointer to a GConfClient*. ! ! ! ! ! ! obj : ! a GConfClient. ! ! <anchor id="gconf-client-get-default">gconf_client_get_default () GConfClient* gconf_client_get_default (void); - Creates a new GConfClient using the default GConfEngine. Normally this is the - engine you want. If someone else is already using the default - GConfClient, this function returns the same one they're using, but - with the reference count incremented. So you have to unref either way. - - - - - - Returns :a new GConfClient. g_object_unref() when you're done. ! ! <anchor id="gconf-client-get-for-engine">gconf_client_get_for_engine () GConfClient* gconf_client_get_for_engine (GConfEngine *engine); ! Creates a new GConfClient with a specific GConfEngine. Only specialized ! configuration-related programs should need to call this function. The ! returned GConfClient should be unref'd when you're done with g_object_unref(). ! Remember to avoid using the GConfEngine directly once you have a GConfClient ! wrapper. ! ! ! ! ! ! engine : ! the GConfEngine to use. ! ! Returns :a new GConfClient. ! ! <anchor id="gconf-client-add-dir">gconf_client_add_dir () void gconf_client_add_dir (GConfClient *client, --- 214,290 ---- GConfEntry *entry, gpointer user_data); ! ! ! client : ! ! ! cnxn_id : ! ! ! entry : ! ! ! user_data : ! ! ! ! ! <anchor id="GConfClientErrorHandlerFunc">GConfClientErrorHandlerFunc () void (*GConfClientErrorHandlerFunc) (GConfClient *client, GError *error); ! ! client : ! ! ! error : ! ! ! ! ! <anchor id="GCONF-CLIENT-CAPS">GCONF_CLIENT() #define GCONF_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCONF_TYPE_CLIENT, GConfClient)) ! ! ! obj : ! ! ! <anchor id="gconf-client-get-default">gconf_client_get_default () GConfClient* gconf_client_get_default (void); + + Returns : ! ! ! <anchor id="gconf-client-get-for-engine">gconf_client_get_for_engine () GConfClient* gconf_client_get_for_engine (GConfEngine *engine); ! ! ! engine : ! ! ! Returns : ! ! <anchor id="gconf-client-add-dir">gconf_client_add_dir () void gconf_client_add_dir (GConfClient *client, *************** *** 476,540 **** GConfClientPreloadType preload, GError **err); - Add a directory to the list of directories the GConfClient will watch. Any - changes to keys below this directory will cause the "value_changed" signal to be - emitted. When you add the directory, you can request that the GConfClient - preload its contents; see GConfClientPreloadType for details. - ! ! Added directories may not overlap. That is, if you add "/foo", you may not add ! "/foo/bar". However you can add "/foo" and "/bar". You can also add "/foo" ! multiple times; if you add a directory multiple times, it will not be removed ! until you call gconf_client_remove_dir() an equal number of times. ! ! ! ! ! ! client : ! a GConfClient. ! ! dir : ! directory to add to the list. ! ! preload : ! degree of preload. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! <anchor id="gconf-client-remove-dir">gconf_client_remove_dir () void gconf_client_remove_dir (GConfClient *client, const gchar *dir, GError **err); - Remove a directory from the list created with gconf_client_add_dir(). If any - notifications have been added below this directory with - gconf_client_notify_add(), those notifications will be disabled until you re-add - the removed directory. Note that if a directory has been added multiple times, - you must remove it the same number of times before the remove takes effect. - - - - - - client : - a GConfClient. - - dir : - directory to remove. - - err : - ! ! <anchor id="gconf-client-notify-add">gconf_client_notify_add () guint gconf_client_notify_add (GConfClient *client, --- 292,334 ---- GConfClientPreloadType preload, GError **err); ! ! client : ! ! ! dir : ! ! ! preload : ! ! ! err : ! ! ! <anchor id="gconf-client-remove-dir">gconf_client_remove_dir () void gconf_client_remove_dir (GConfClient *client, const gchar *dir, GError **err); + + client : + + + dir : + + + err : + ! ! ! <anchor id="gconf-client-notify-add">gconf_client_notify_add () guint gconf_client_notify_add (GConfClient *client, *************** *** 544,678 **** GFreeFunc destroy_notify, GError **err); - Request notification of changes to namespace_section. This includes the key - namespace_section itself, and any keys below it (the behavior is identical to - gconf_engine_notify_add(), but while gconf_engine_notify_add() places a notification request - on the server for every notify function, GConfClient requests server - notification for directories added with gconf_client_add_dir() and keeps the - list of GConfClientNotifyFunc on the client side). - - - - For the notification to happen, namespace_section must be equal to or below one - of the directories added with gconf_client_add_dir(). You can still call - gconf_client_notify_add() for other directories, but no notification will be - received until you add a directory above or equal to namespace_section. One - implication of this is that gconf_client_remove_dir() temporarily disables - notifications that were below the removed directory. - - - - The function returns a connection ID you can use to call - gconf_client_notify_remove(). - ! ! See the description of GConfClientNotifyFunc for details on how the ! notification function is called. ! ! ! ! ! ! client : ! a GConfClient. ! ! namespace_section : ! where to listen for changes. ! ! func : ! function to call when changes occur. ! ! user_data : ! user data to pass to func. ! ! destroy_notify : ! function to call on user_data when the notify is removed or the GConfClient is destroyed, or NULL for none. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :a connection ID for removing the notification. ! ! <anchor id="gconf-client-notify-remove">gconf_client_notify_remove () void gconf_client_notify_remove (GConfClient *client, guint cnxn); ! Remove a notification using the ID returned from ! gconf_client_notify_add(). Invokes the destroy notify function on the ! notification's user data, if appropriate. ! ! ! ! ! ! client : ! a GConfClient. ! ! cnxn : ! connection ID. ! ! <anchor id="gconf-client-set-error-handling">gconf_client_set_error_handling () void gconf_client_set_error_handling (GConfClient *client, GConfClientErrorHandlingMode mode); ! Controls the default error handling for GConfClient. See ! GConfClientErrorHandlingMode and GConfClientParentWindowFunc for details on this. ! ! ! ! ! ! client : ! a GConfClient. ! ! mode : ! error handling mode. ! ! <anchor id="gconf-client-set-global-default-error-handler">gconf_client_set_global_default_error_handler () void gconf_client_set_global_default_error_handler (GConfClientErrorHandlerFunc func); ! ! ! ! ! ! func : ! ! ! <anchor id="gconf-client-clear-cache">gconf_client_clear_cache () void gconf_client_clear_cache (GConfClient *client); ! Dumps everything out of the GConfClient client-side cache. If you know you're ! done using the GConfClient for a while, you can call this function to save some ! memory. ! ! ! ! ! ! client : ! a GConfClient. ! ! <anchor id="gconf-client-preload">gconf_client_preload () void gconf_client_preload (GConfClient *client, --- 338,425 ---- GFreeFunc destroy_notify, GError **err); ! ! client : ! ! ! namespace_section : ! ! ! func : ! ! ! user_data : ! ! ! destroy_notify : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-notify-remove">gconf_client_notify_remove () void gconf_client_notify_remove (GConfClient *client, guint cnxn); ! ! ! client : ! ! ! cnxn : ! ! ! <anchor id="gconf-client-set-error-handling">gconf_client_set_error_handling () void gconf_client_set_error_handling (GConfClient *client, GConfClientErrorHandlingMode mode); ! ! ! client : ! ! ! mode : ! ! ! ! ! <anchor id="gconf-client-set-global-default-error-handler">gconf_client_set_global_default_error_handler () void gconf_client_set_global_default_error_handler (GConfClientErrorHandlerFunc func); ! ! func : ! ! ! <anchor id="gconf-client-clear-cache">gconf_client_clear_cache () void gconf_client_clear_cache (GConfClient *client); ! ! ! client : ! ! ! <anchor id="gconf-client-preload">gconf_client_preload () void gconf_client_preload (GConfClient *client, *************** *** 680,708 **** GConfClientPreloadType type, GError **err); - Preloads a directory. Normally you do this when you call gconf_client_add_dir(), - but if you've called gconf_client_clear_cache() there may be a reason to do it - again. - - - - - - client : - a GConfClient. - - dirname : - directory to preload. - - type : - degree of preload. - - err : - the return location for an allocated GError, or NULL to ignore errors. ! ! <anchor id="gconf-client-set">gconf_client_set () void gconf_client_set (GConfClient *client, --- 427,449 ---- GConfClientPreloadType type, GError **err); + + client : + + + dirname : + + + type : + + + err : + ! ! ! <anchor id="gconf-client-set">gconf_client_set () void gconf_client_set (GConfClient *client, *************** *** 710,738 **** const GConfValue *val, GError **err); ! Sets the value of a configuration key. Just like gconf_engine_set(), but uses ! GConfClient caching and error-handling features. The val argument will not be ! modified. ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! key to set. ! ! val : ! new value. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! <anchor id="gconf-client-get">gconf_client_get () GConfValue* gconf_client_get (GConfClient *client, --- 451,473 ---- const GConfValue *val, GError **err); ! ! ! client : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! <anchor id="gconf-client-get">gconf_client_get () GConfValue* gconf_client_get (GConfClient *client, *************** *** 740,764 **** GError **err); ! ! ! ! ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-without-default">gconf_client_get_without_default () GConfValue* gconf_client_get_without_default --- 475,495 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-without-default">gconf_client_get_without_default () GConfValue* gconf_client_get_without_default *************** *** 767,791 **** GError **err); ! ! ! ! ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-entry">gconf_client_get_entry () GConfEntry* gconf_client_get_entry (GConfClient *client, --- 498,518 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-entry">gconf_client_get_entry () GConfEntry* gconf_client_get_entry (GConfClient *client, *************** *** 795,825 **** GError **err); ! ! ! ! ! ! client : ! ! ! key : ! ! ! locale : ! ! ! use_schema_default : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-default-from-schema">gconf_client_get_default_from_schema () GConfValue* gconf_client_get_default_from_schema --- 522,548 ---- GError **err); ! ! client : ! ! ! key : ! ! ! locale : ! ! ! use_schema_default : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-default-from-schema">gconf_client_get_default_from_schema () GConfValue* gconf_client_get_default_from_schema *************** *** 828,852 **** GError **err); ! ! ! ! ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-unset">gconf_client_unset () gboolean gconf_client_unset (GConfClient *client, --- 551,571 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-unset">gconf_client_unset () gboolean gconf_client_unset (GConfClient *client, *************** *** 854,878 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-all-entries">gconf_client_all_entries () GSList* gconf_client_all_entries (GConfClient *client, --- 573,593 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-all-entries">gconf_client_all_entries () GSList* gconf_client_all_entries (GConfClient *client, *************** *** 880,904 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! dir : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-all-dirs">gconf_client_all_dirs () GSList* gconf_client_all_dirs (GConfClient *client, --- 595,615 ---- GError **err); ! ! client : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-all-dirs">gconf_client_all_dirs () GSList* gconf_client_all_dirs (GConfClient *client, *************** *** 906,950 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! dir : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-suggest-sync">gconf_client_suggest_sync () void gconf_client_suggest_sync (GConfClient *client, GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! <anchor id="gconf-client-dir-exists">gconf_client_dir_exists () gboolean gconf_client_dir_exists (GConfClient *client, --- 617,653 ---- GError **err); ! ! client : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-suggest-sync">gconf_client_suggest_sync () void gconf_client_suggest_sync (GConfClient *client, GError **err); ! ! client : ! ! ! err : ! ! ! <anchor id="gconf-client-dir-exists">gconf_client_dir_exists () gboolean gconf_client_dir_exists (GConfClient *client, *************** *** 952,976 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! dir : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-get-float">gconf_client_get_float () gdouble gconf_client_get_float (GConfClient *client, --- 655,675 ---- GError **err); ! ! client : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-float">gconf_client_get_float () gdouble gconf_client_get_float (GConfClient *client, *************** *** 978,1002 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-get-int">gconf_client_get_int () gint gconf_client_get_int (GConfClient *client, --- 677,697 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-int">gconf_client_get_int () gint gconf_client_get_int (GConfClient *client, *************** *** 1004,1028 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-get-string">gconf_client_get_string () gchar* gconf_client_get_string (GConfClient *client, --- 699,719 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-string">gconf_client_get_string () gchar* gconf_client_get_string (GConfClient *client, *************** *** 1030,1054 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-get-bool">gconf_client_get_bool () gboolean gconf_client_get_bool (GConfClient *client, --- 721,741 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-bool">gconf_client_get_bool () gboolean gconf_client_get_bool (GConfClient *client, *************** *** 1056,1080 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-get-schema">gconf_client_get_schema () GConfSchema* gconf_client_get_schema (GConfClient *client, --- 743,763 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-schema">gconf_client_get_schema () GConfSchema* gconf_client_get_schema (GConfClient *client, *************** *** 1082,1106 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-get-list">gconf_client_get_list () GSList* gconf_client_get_list (GConfClient *client, --- 765,785 ---- GError **err); ! ! client : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-list">gconf_client_get_list () GSList* gconf_client_get_list (GConfClient *client, *************** *** 1109,1136 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! list_type : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-get-pair">gconf_client_get_pair () gboolean gconf_client_get_pair (GConfClient *client, --- 788,811 ---- GError **err); ! ! client : ! ! ! key : ! ! ! list_type : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-get-pair">gconf_client_get_pair () gboolean gconf_client_get_pair (GConfClient *client, *************** *** 1142,1178 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! car_retloc : ! ! ! cdr_retloc : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-set-float">gconf_client_set_float () gboolean gconf_client_set_float (GConfClient *client, --- 817,849 ---- GError **err); ! ! client : ! ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! car_retloc : ! ! ! cdr_retloc : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-set-float">gconf_client_set_float () gboolean gconf_client_set_float (GConfClient *client, *************** *** 1181,1208 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-set-int">gconf_client_set_int () gboolean gconf_client_set_int (GConfClient *client, --- 852,875 ---- GError **err); ! ! client : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-set-int">gconf_client_set_int () gboolean gconf_client_set_int (GConfClient *client, *************** *** 1211,1238 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-set-string">gconf_client_set_string () gboolean gconf_client_set_string (GConfClient *client, --- 878,901 ---- GError **err); ! ! client : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-set-string">gconf_client_set_string () gboolean gconf_client_set_string (GConfClient *client, *************** *** 1241,1268 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-set-bool">gconf_client_set_bool () gboolean gconf_client_set_bool (GConfClient *client, --- 904,927 ---- GError **err); ! ! client : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-set-bool">gconf_client_set_bool () gboolean gconf_client_set_bool (GConfClient *client, *************** *** 1271,1298 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-set-schema">gconf_client_set_schema () gboolean gconf_client_set_schema (GConfClient *client, --- 930,953 ---- GError **err); ! ! client : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-set-schema">gconf_client_set_schema () gboolean gconf_client_set_schema (GConfClient *client, *************** *** 1301,1328 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-set-list">gconf_client_set_list () gboolean gconf_client_set_list (GConfClient *client, --- 956,979 ---- GError **err); ! ! client : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-set-list">gconf_client_set_list () gboolean gconf_client_set_list (GConfClient *client, *************** *** 1332,1362 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! list_type : ! ! ! list : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-set-pair">gconf_client_set_pair () gboolean gconf_client_set_pair (GConfClient *client, --- 983,1009 ---- GError **err); ! ! client : ! ! ! key : ! ! ! list_type : ! ! ! list : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-set-pair">gconf_client_set_pair () gboolean gconf_client_set_pair (GConfClient *client, *************** *** 1368,1468 **** GError **err); ! ! ! ! ! ! client : ! a GConfClient. ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-client-error">gconf_client_error () void gconf_client_error (GConfClient *client, GError *error); - Emits the "error" signal. Rarely useful. - - - - - - client : - a GConfClient. - - error : - error to pass to signal handlers. ! ! <anchor id="gconf-client-unreturned-error">gconf_client_unreturned_error () void gconf_client_unreturned_error (GConfClient *client, GError *error); ! Emits the "unreturned_error" signal. Rarely useful. ! ! ! ! ! ! client : ! a GConfClient. ! ! error : ! error to pass to signal handlers. ! ! <anchor id="gconf-client-value-changed">gconf_client_value_changed () void gconf_client_value_changed (GConfClient *client, const gchar *key, GConfValue *value); - Emits the "value_changed" signal. Rarely useful. - - - - - - client : - a GConfClient. - - key : - key to pass to signal handlers. - - value : - value of key to pass to signal handlers. ! ! <anchor id="gconf-client-reverse-change-set">gconf_client_reverse_change_set () GConfChangeSet* gconf_client_reverse_change_set --- 1015,1099 ---- GError **err); ! ! client : ! ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-error">gconf_client_error () void gconf_client_error (GConfClient *client, GError *error); + + client : + + + error : + ! ! ! <anchor id="gconf-client-unreturned-error">gconf_client_unreturned_error () void gconf_client_unreturned_error (GConfClient *client, GError *error); ! ! ! client : ! ! ! error : ! ! ! <anchor id="gconf-client-value-changed">gconf_client_value_changed () void gconf_client_value_changed (GConfClient *client, const gchar *key, GConfValue *value); + + client : + + + key : + + + value : + ! ! ! <anchor id="gconf-client-reverse-change-set">gconf_client_reverse_change_set () GConfChangeSet* gconf_client_reverse_change_set *************** *** 1470,1496 **** GConfChangeSet *cs, GError **err); ! Creates a change set that would reverse cs. That is, for each change in cs, ! save the current state of that key in the returned change set. ! ! ! ! ! ! client : ! a GConfClient. ! ! cs : ! change set to create the reverse of. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :a new change set that would restore the current state of each key in cs. ! ! <anchor id="gconf-client-change-set-from-currentv">gconf_client_change_set_from_currentv () GConfChangeSet* gconf_client_change_set_from_currentv --- 1101,1122 ---- GConfChangeSet *cs, GError **err); ! ! ! client : ! ! ! cs : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-client-change-set-from-currentv">gconf_client_change_set_from_currentv () GConfChangeSet* gconf_client_change_set_from_currentv *************** *** 1498,1526 **** const gchar **keys, GError **err); - Creates a change set that will change the keys in - NULL-terminated array keys to their current state. Use this to - save the current state of a collection of keys; then you can later revert to the - current state by committing the returned change set. - - - - - - client : - a GConfClient. - - keys : - NULL-terminated array of key names. - - err : - the return location for an allocated GError, or NULL to ignore errors. - - Returns :new change set that changes all the keys to their current state. ! ! <anchor id="gconf-client-change-set-from-current">gconf_client_change_set_from_current () GConfChangeSet* gconf_client_change_set_from_current --- 1124,1145 ---- const gchar **keys, GError **err); + + client : + + + keys : + + + err : + + + Returns : ! ! ! <anchor id="gconf-client-change-set-from-current">gconf_client_change_set_from_current () GConfChangeSet* gconf_client_change_set_from_current *************** *** 1529,1557 **** const gchar *first_key, ...); ! Convenient varargs version of gconf_client_change_set_from_currentv(). ! ! ! ! ! ! client : ! a GConfClient. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! first_key : ! first key to save the current state of. ! ! ... : ! NULL-terminated list of additional keys. ! ! Returns :new change set that changes all the keys to their current state. ! ! <anchor id="gconf-client-commit-change-set">gconf_client_commit_change_set () gboolean gconf_client_commit_change_set (GConfClient *client, --- 1148,1172 ---- const gchar *first_key, ...); ! ! ! client : ! ! ! err : ! ! ! first_key : ! ! ! ... : ! ! ! Returns : ! ! <anchor id="gconf-client-commit-change-set">gconf_client_commit_change_set () gboolean gconf_client_commit_change_set (GConfClient *client, *************** *** 1560,1587 **** GError **err); ! ! ! ! ! ! client : ! ! ! cs : ! ! ! remove_committed : ! ! ! err : ! ! ! Returns : ! ! --- 1175,1198 ---- GError **err); ! ! client : ! ! ! cs : ! ! ! remove_committed : ! ! ! err : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-engine.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-engine.sgml *** ./GConf/doc/gconf/sgml/gconf-engine.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-engine.sgml Sat Aug 9 21:12:04 2003 *************** *** 1,16 **** ! GConfEngine 3 GCONF Library ! GConfEngine ! a GConf "database" Synopsis --- 1,16 ---- ! gconf-engine 3 GCONF Library ! gconf-engine Synopsis + *************** *** 30,49 **** Description - A GConfEngine represents a connection to the GConf database. The - default GConfEngine, returned from gconf_engine_get_default(), represents the - user's normal configuration source search path. Configuration-related - utilities, such as a configuration editor tool, might wish to access a - particular configuration source directly; they can obtain a - non-default GConfEngine with gconf_engine_get_for_address(). - - - Once you have a GConfEngine, you can query and manipulate - configuration values. --- 30,41 ---- + + Description *************** *** 53,164 **** <anchor id="GConfEngine">struct GConfEngine struct GConfEngine; ! An opaque data type representing one or more configuration sources. <anchor id="gconf-engine-get-default">gconf_engine_get_default () GConfEngine* gconf_engine_get_default (void); - Returns the default GConfEngine. All clients should use this, unless - they are special configuration-related tools. The caller of this - function assumes one reference count, and must call - gconf_engine_unref() at some point. It's fairly important to unref the - GConfEngine, to cleanly close the connection to - gconfd. So if possible close the connection - before exiting your application. - - - - - - Returns :the default GConfEngine. ! ! <anchor id="gconf-engine-get-for-address">gconf_engine_get_for_address () GConfEngine* gconf_engine_get_for_address (const gchar *address, GError **err); ! Obtains a special GConfEngine; mostly useful for specialized ! GConf-related tools. Normal clients shouldn't need to use it. ! As with gconf_engine_get_default(), the returned GConfEngine should be ! unreferenced by the caller of this function. ! ! ! ! ! ! address : ! a configuration source address. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :a GConfEngine. ! ! <anchor id="gconf-engine-get-local">gconf_engine_get_local () GConfEngine* gconf_engine_get_local (const gchar *address, GError **err); ! Obtain a local (non-process-transparent) GConfEngine. Local engines ! do not support notification, and can only access config databases ! directly (they do not use the multiple sources in a path system ! supported by nonlocal engines). ! ! ! ! ! ! address : ! address of local database ! ! err : ! return location of an allocated GError ! ! Returns :a GConfEngine ! ! <anchor id="gconf-engine-unref">gconf_engine_unref () void gconf_engine_unref (GConfEngine *conf); - Decreases the reference count of a GConfEngine by one; if the - reference count reaches 0, destroys the GConfEngine. - - - - - - conf : - a GConfEngine. ! ! <anchor id="gconf-engine-ref">gconf_engine_ref () void gconf_engine_ref (GConfEngine *conf); ! Increases the reference count of a GConfEngine by one. ! ! ! ! ! ! conf : ! a GConfEngine. ! ! --- 45,123 ---- <anchor id="GConfEngine">struct GConfEngine struct GConfEngine; ! <anchor id="gconf-engine-get-default">gconf_engine_get_default () GConfEngine* gconf_engine_get_default (void); + + Returns : ! ! ! <anchor id="gconf-engine-get-for-address">gconf_engine_get_for_address () GConfEngine* gconf_engine_get_for_address (const gchar *address, GError **err); ! ! ! address : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-local">gconf_engine_get_local () GConfEngine* gconf_engine_get_local (const gchar *address, GError **err); ! ! ! address : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-unref">gconf_engine_unref () void gconf_engine_unref (GConfEngine *conf); + + conf : + ! ! ! <anchor id="gconf-engine-ref">gconf_engine_ref () void gconf_engine_ref (GConfEngine *conf); ! ! ! conf : ! ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-error.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-error.sgml *** ./GConf/doc/gconf/sgml/gconf-error.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-error.sgml Sat Aug 9 21:12:04 2003 *************** *** 1,16 **** ! GError 3 GCONF Library ! GError ! error reporting. Synopsis --- 1,16 ---- ! gconf-error 3 GCONF Library ! gconf-error Synopsis + *************** *** 32,101 **** Description - The GError object is used to report errors that occur in GConf - library routines. All functions that report errors work the same way: - - - - The last argument to the function is a GError**, a pointer to a - location where a GError* can be placed. - - - - - This last argument may be NULL, in which case no - error will be returned. - - - - - If non-NULL, the argument should be the address of a - GError* variable, which should be initialized to - NULL. - - - - - If an error occurs, a GError will be allocated and placed in the - return location; the caller must free the GError with - g_error_free(). If no error occurs, the return location will be - left untouched. That is, the test error != NULL - should always be a reliable indicator of whether the operation failed. - - - - - - It's also common that the return value of a function indicates whether - or not an error occurred. Typically, TRUE is returned - on success. In some cases, a NULL return value - indicates failure. Either way, if the return value indicates failure - and you passed a non-NULL value for the last argument - to the function, a GError will be returned. If the return value - indicates success, then a GError will never be returned. These - relationships are guaranteed; that is, you can reliably use the return - value to decide whether a GError was placed in the return - location. If a function does not indicate - success/failure by return value, you must check whether the - GError is NULL to detect errors. - - - - Here's a short error handling example: - - GError* err = NULL; - - if (!gconf_init(&err)) - { - fprintf(stderr, _("Failed to init GConf: s\n"), err->message); - g_error_free(err); - err = NULL; - } - --- 32,43 ---- + + Description *************** *** 127,256 **** } GConfError; ! The GConfError enumeration allows client applications to ! differentiate between different kinds of error. You may wish to take ! specific actions depending on the error type. ! ! ! ! ! ! ! GCONF_ERROR_SUCCESS ! indicates that no error occurred, won't be returned in a GError. ! ! ! ! GCONF_ERROR_FAILED ! indicates failure, but no more specific GConfError applied. ! ! ! ! GCONF_ERROR_NO_SERVER ! indicates that the GConf server couldn't be contacted, probably a CORBA problem. ! ! ! ! GCONF_ERROR_NO_PERMISSION ! indicates that permission to access some resource was denied. ! ! ! ! GCONF_ERROR_BAD_ADDRESS ! indicates that a configuration source address was syntactically invalid or impossible to resolve. ! ! ! ! GCONF_ERROR_BAD_KEY ! indicates that a key was malformed. ! ! ! ! GCONF_ERROR_PARSE_ERROR ! indicates that some parsing was done (perhaps in a backend) and it failed. ! ! ! ! GCONF_ERROR_CORRUPT ! indicates that some part of the database is corrupt. ! ! ! ! GCONF_ERROR_TYPE_MISMATCH ! indicates that a specific type was required, and another type was found. ! ! ! ! GCONF_ERROR_IS_DIR ! indicates that an operation only applicable to keys was performed on a directory. ! ! ! ! GCONF_ERROR_IS_KEY ! indicates that an operation only applicable to directories was performed on a key. ! ! ! ! GCONF_ERROR_OVERRIDDEN ! indicates that the administrator has imposed a mandatory value, and it could not be changed. ! ! ! ! GCONF_ERROR_OAF_ERROR ! ! ! ! ! GCONF_ERROR_LOCAL_ENGINE ! ! ! ! ! GCONF_ERROR_LOCK_FAILED ! ! ! ! ! GCONF_ERROR_NO_WRITABLE_DATABASE ! ! ! ! ! GCONF_ERROR_IN_SHUTDOWN ! ! ! ! ! <anchor id="gconf-error-new">gconf_error_new () GError* gconf_error_new (GConfError en, const gchar *format, ...); ! Creates a new error. Normally the GConf library does this, but you ! might find a reason to do it as well. en is the error number, format ! is a printf()-style format for the error message, and the variable ! argument list is the same as in printf(). ! ! ! ! ! ! en : ! the error number. ! ! format : ! printf()-style format for error description. ! ! ... : ! arguments required by the format. ! ! Returns :newly-allocated GError. ! ! <anchor id="gconf-set-error">gconf_set_error () void gconf_set_error (GError **err, --- 69,98 ---- } GConfError; ! ! <anchor id="gconf-error-new">gconf_error_new () GError* gconf_error_new (GConfError en, const gchar *format, ...); ! ! ! en : ! ! ! format : ! ! ! ... : ! ! ! Returns : ! ! <anchor id="gconf-set-error">gconf_set_error () void gconf_set_error (GError **err, *************** *** 258,306 **** const gchar *format, ...); - Internal function. - - - - - - err : - - - en : - - - format : - - - ... : - ! ! <anchor id="gconf-compose-errors">gconf_compose_errors () GError* gconf_compose_errors (GError *err1, GError *err2); ! Internal function. ! ! ! ! ! ! err1 : ! ! ! err2 : ! ! ! Returns : ! ! --- 100,140 ---- const gchar *format, ...); + + err : + + + en : + + + format : + + + ... : + ! ! ! <anchor id="gconf-compose-errors">gconf_compose_errors () GError* gconf_compose_errors (GError *err1, GError *err2); ! ! ! err1 : ! ! ! err2 : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-internals.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-internals.sgml *** ./GConf/doc/gconf/sgml/gconf-internals.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-internals.sgml Sat Aug 9 21:12:04 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + *************** *** 98,103 **** --- 99,106 ---- + + Description *************** *** 112,386 **** gchar* gconf_key_directory (const gchar *key); ! ! ! ! ! ! key : ! ! ! Returns : ! ! <anchor id="gconf-key-key">gconf_key_key () const gchar* gconf_key_key (const gchar *key); ! ! ! ! ! ! key : ! ! ! Returns : ! ! <anchor id="gconf-file-test">gconf_file_test () gboolean gconf_file_test (const gchar *filename, int test); ! ! ! ! ! ! filename : ! ! ! test : ! ! ! Returns : ! ! <anchor id="gconf-file-exists">gconf_file_exists () gboolean gconf_file_exists (const gchar *filename); ! ! ! ! ! ! filename : ! ! ! Returns : ! ! <anchor id="gconf-value-from-corba-value">gconf_value_from_corba_value () GConfValue* gconf_value_from_corba_value (const ConfigValue *value); ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-schema-from-corba-schema">gconf_schema_from_corba_schema () GConfSchema* gconf_schema_from_corba_schema (const ConfigSchema *cs); ! ! ! ! ! ! cs : ! ! ! Returns : ! ! <anchor id="gconf-value-type-to-string">gconf_value_type_to_string () const gchar* gconf_value_type_to_string (GConfValueType type); ! ! ! ! ! ! type : ! ! ! Returns : ! ! <anchor id="gconf-value-type-from-string">gconf_value_type_from_string () GConfValueType gconf_value_type_from_string (const gchar *str); ! ! ! ! ! ! str : ! ! ! Returns : ! ! <anchor id="gconf-load-source-path">gconf_load_source_path () GSList* gconf_load_source_path (const gchar *filename, GError **err); ! ! ! ! ! ! filename : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-shutdown-daemon">gconf_shutdown_daemon () void gconf_shutdown_daemon (GError **err); ! ! ! ! ! ! err : ! ! ! <anchor id="gconf-ping-daemon">gconf_ping_daemon () gboolean gconf_ping_daemon (void); ! ! ! ! ! ! Returns : ! ! <anchor id="gconf-spawn-daemon">gconf_spawn_daemon () gboolean gconf_spawn_daemon (GError **err); ! ! ! ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-concat-dir-and-key">gconf_concat_dir_and_key () gchar* gconf_concat_dir_and_key (const gchar *dir, const gchar *key); ! ! ! ! ! ! dir : ! ! ! key : ! ! ! Returns : ! ! <anchor id="gconf-string-to-gulong">gconf_string_to_gulong () gulong gconf_string_to_gulong (const gchar *str); ! ! ! ! ! ! str : ! ! ! Returns : ! ! <anchor id="gconf-current-locale">gconf_current_locale () const gchar* gconf_current_locale (void); ! ! ! ! ! ! Returns : ! ! <anchor id="GConfLogPriority">enum GConfLogPriority typedef enum { --- 115,329 ---- gchar* gconf_key_directory (const gchar *key); ! ! key : ! ! ! Returns : ! ! <anchor id="gconf-key-key">gconf_key_key () const gchar* gconf_key_key (const gchar *key); ! ! key : ! ! ! Returns : ! ! <anchor id="gconf-file-test">gconf_file_test () gboolean gconf_file_test (const gchar *filename, int test); ! ! filename : ! ! ! test : ! ! ! Returns : ! ! <anchor id="gconf-file-exists">gconf_file_exists () gboolean gconf_file_exists (const gchar *filename); ! ! filename : ! ! ! Returns : ! ! <anchor id="gconf-value-from-corba-value">gconf_value_from_corba_value () GConfValue* gconf_value_from_corba_value (const ConfigValue *value); ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-schema-from-corba-schema">gconf_schema_from_corba_schema () GConfSchema* gconf_schema_from_corba_schema (const ConfigSchema *cs); ! ! cs : ! ! ! Returns : ! ! <anchor id="gconf-value-type-to-string">gconf_value_type_to_string () const gchar* gconf_value_type_to_string (GConfValueType type); ! ! type : ! ! ! Returns : ! ! <anchor id="gconf-value-type-from-string">gconf_value_type_from_string () GConfValueType gconf_value_type_from_string (const gchar *str); ! ! str : ! ! ! Returns : ! ! <anchor id="gconf-load-source-path">gconf_load_source_path () GSList* gconf_load_source_path (const gchar *filename, GError **err); ! ! filename : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-shutdown-daemon">gconf_shutdown_daemon () void gconf_shutdown_daemon (GError **err); ! ! err : ! ! ! <anchor id="gconf-ping-daemon">gconf_ping_daemon () gboolean gconf_ping_daemon (void); ! ! Returns : ! ! <anchor id="gconf-spawn-daemon">gconf_spawn_daemon () gboolean gconf_spawn_daemon (GError **err); ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-concat-dir-and-key">gconf_concat_dir_and_key () gchar* gconf_concat_dir_and_key (const gchar *dir, const gchar *key); ! ! dir : ! ! ! key : ! ! ! Returns : ! ! <anchor id="gconf-string-to-gulong">gconf_string_to_gulong () gulong gconf_string_to_gulong (const gchar *str); ! ! str : ! ! ! Returns : ! ! <anchor id="gconf-current-locale">gconf_current_locale () const gchar* gconf_current_locale (void); ! ! Returns : ! ! <anchor id="GConfLogPriority">enum GConfLogPriority typedef enum { *************** *** 404,475 **** ...); ! ! ! ! ! ! pri : ! ! ! format : ! ! ! ... : ! ! ! <anchor id="gconf-key-check">gconf_key_check () gboolean gconf_key_check (const gchar *key, GError **err); ! ! ! ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-new-from-string">gconf_value_new_from_string () GConfValue* gconf_value_new_from_string (GConfValueType type, const gchar *str, GError **err); - Tries to parse a string and create a primitive GConfValue from - it. Only works on primitive types. - - - - - - type : - - - str : - - - err : - - - Returns : ! ! <anchor id="gconf-value-new-list-from-string">gconf_value_new_list_from_string () GConfValue* gconf_value_new_list_from_string --- 347,405 ---- ...); ! ! pri : ! ! ! format : ! ! ! ... : ! ! ! <anchor id="gconf-key-check">gconf_key_check () gboolean gconf_key_check (const gchar *key, GError **err); ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-new-from-string">gconf_value_new_from_string () GConfValue* gconf_value_new_from_string (GConfValueType type, const gchar *str, GError **err); + + type : + + + str : + + + err : + + + Returns : ! ! ! <anchor id="gconf-value-new-list-from-string">gconf_value_new_list_from_string () GConfValue* gconf_value_new_list_from_string *************** *** 477,502 **** const gchar *str, GError **err); ! This function does not work. Don't use it. ! ! ! ! ! ! list_type : ! ! ! str : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-new-pair-from-string">gconf_value_new_pair_from_string () GConfValue* gconf_value_new_pair_from_string --- 407,428 ---- const gchar *str, GError **err); ! ! ! list_type : ! ! ! str : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-new-pair-from-string">gconf_value_new_pair_from_string () GConfValue* gconf_value_new_pair_from_string *************** *** 505,551 **** const gchar *str, GError **err); - This function does not work. Don't use it. - - - - - - car_type : - - - cdr_type : - - - str : - - - err : - - - Returns : ! ! <anchor id="gconf-quote-string">gconf_quote_string () gchar* gconf_quote_string (const gchar *str); ! ! ! ! ! ! str : ! ! ! Returns : ! ! <anchor id="gconf-unquote-string">gconf_unquote_string () gchar* gconf_unquote_string (const gchar *str, --- 431,469 ---- const gchar *str, GError **err); + + car_type : + + + cdr_type : + + + str : + + + err : + + + Returns : ! ! ! <anchor id="gconf-quote-string">gconf_quote_string () gchar* gconf_quote_string (const gchar *str); ! ! str : ! ! ! Returns : ! ! <anchor id="gconf-unquote-string">gconf_unquote_string () gchar* gconf_unquote_string (const gchar *str, *************** *** 553,577 **** GError **err); ! ! ! ! ! ! str : ! ! ! end : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-unquote-string-inplace">gconf_unquote_string_inplace () void gconf_unquote_string_inplace (gchar *str, --- 471,491 ---- GError **err); ! ! str : ! ! ! end : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-unquote-string-inplace">gconf_unquote_string_inplace () void gconf_unquote_string_inplace (gchar *str, *************** *** 579,655 **** GError **err); ! ! ! ! ! ! str : ! ! ! end : ! ! ! err : ! ! ! <anchor id="gconf-value-decode">gconf_value_decode () GConfValue* gconf_value_decode (const gchar *encoded); ! ! ! ! ! ! encoded : ! ! ! Returns : ! ! <anchor id="gconf-value-encode">gconf_value_encode () gchar* gconf_value_encode (GConfValue *val); ! ! ! ! ! ! val : ! ! ! Returns : ! ! <anchor id="gconf-quote-percents">gconf_quote_percents () gchar* gconf_quote_percents (const gchar *src); ! ! ! ! ! ! src : ! ! ! Returns : ! ! <anchor id="gconf-value-list-from-primitive-list">gconf_value_list_from_primitive_list () GConfValue* gconf_value_list_from_primitive_list --- 493,553 ---- GError **err); ! ! str : ! ! ! end : ! ! ! err : ! ! ! <anchor id="gconf-value-decode">gconf_value_decode () GConfValue* gconf_value_decode (const gchar *encoded); ! ! encoded : ! ! ! Returns : ! ! <anchor id="gconf-value-encode">gconf_value_encode () gchar* gconf_value_encode (GConfValue *val); ! ! val : ! ! ! Returns : ! ! <anchor id="gconf-quote-percents">gconf_quote_percents () gchar* gconf_quote_percents (const gchar *src); ! ! src : ! ! ! Returns : ! ! <anchor id="gconf-value-list-from-primitive-list">gconf_value_list_from_primitive_list () GConfValue* gconf_value_list_from_primitive_list *************** *** 658,682 **** GError **err); ! ! ! ! ! ! list_type : ! ! ! list : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-pair-from-primitive-pair">gconf_value_pair_from_primitive_pair () GConfValue* gconf_value_pair_from_primitive_pair --- 556,576 ---- GError **err); ! ! list_type : ! ! ! list : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-pair-from-primitive-pair">gconf_value_pair_from_primitive_pair () GConfValue* gconf_value_pair_from_primitive_pair *************** *** 687,717 **** GError **err); ! ! ! ! ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-list-to-primitive-list-destructive">gconf_value_list_to_primitive_list_destructive () GSList* gconf_value_list_to_primitive_list_destructive --- 581,607 ---- GError **err); ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-list-to-primitive-list-destructive">gconf_value_list_to_primitive_list_destructive () GSList* gconf_value_list_to_primitive_list_destructive *************** *** 720,744 **** GError **err); ! ! ! ! ! ! val : ! ! ! list_type : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-pair-to-primitive-pair-destructive">gconf_value_pair_to_primitive_pair_destructive () gboolean gconf_value_pair_to_primitive_pair_destructive --- 610,630 ---- GError **err); ! ! val : ! ! ! list_type : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-value-pair-to-primitive-pair-destructive">gconf_value_pair_to_primitive_pair_destructive () gboolean gconf_value_pair_to_primitive_pair_destructive *************** *** 750,821 **** GError **err); ! ! ! ! ! ! val : ! ! ! car_type : ! ! ! cdr_type : ! ! ! car_retloc : ! ! ! cdr_retloc : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-set-daemon-mode">gconf_set_daemon_mode () void gconf_set_daemon_mode (gboolean setting); ! ! ! ! ! ! setting : ! ! ! <anchor id="gconf-handle-oaf-exception">gconf_handle_oaf_exception () gboolean gconf_handle_oaf_exception (CORBA_Environment *ev, GError **err); ! ! ! ! ! ! ev : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-full">gconf_engine_get_full () GConfValue* gconf_engine_get_full (GConfEngine *conf, --- 636,695 ---- GError **err); ! ! val : ! ! ! car_type : ! ! ! cdr_type : ! ! ! car_retloc : ! ! ! cdr_retloc : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-set-daemon-mode">gconf_set_daemon_mode () void gconf_set_daemon_mode (gboolean setting); ! ! setting : ! ! ! <anchor id="gconf-handle-oaf-exception">gconf_handle_oaf_exception () gboolean gconf_handle_oaf_exception (CORBA_Environment *ev, GError **err); ! ! ev : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-full">gconf_engine_get_full () GConfValue* gconf_engine_get_full (GConfEngine *conf, *************** *** 826,861 **** gboolean *is_writable_p, GError **err); ! This function is basically for internal use. ! ! ! ! ! ! conf : ! ! ! key : ! ! ! locale : ! ! ! use_schema_default : ! ! ! is_default_p : ! ! ! is_writable_p : ! ! ! err : ! ! ! Returns : ! ! --- 700,733 ---- gboolean *is_writable_p, GError **err); ! ! ! conf : ! ! ! key : ! ! ! locale : ! ! ! use_schema_default : ! ! ! is_default_p : ! ! ! is_writable_p : ! ! ! err : ! ! ! Returns : ! ! ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-listeners.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-listeners.sgml *** ./GConf/doc/gconf/sgml/gconf-listeners.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-listeners.sgml Sat Aug 9 21:12:04 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + *************** *** 40,45 **** --- 41,48 ---- + + Description *************** *** 64,123 **** gpointer user_data); ! ! ! ! ! ! listeners : ! ! ! all_above_key : ! ! ! cnxn_id : ! ! ! listener_data : ! ! ! user_data : ! ! ! <anchor id="gconf-listeners-new">gconf_listeners_new () GConfListeners* gconf_listeners_new (void); ! ! ! ! ! ! Returns : ! ! <anchor id="gconf-listeners-free">gconf_listeners_free () void gconf_listeners_free (GConfListeners *listeners); ! ! ! ! ! ! listeners : ! ! ! <anchor id="gconf-listeners-add">gconf_listeners_add () guint gconf_listeners_add (GConfListeners *listeners, --- 67,114 ---- gpointer user_data); ! ! listeners : ! ! ! all_above_key : ! ! ! cnxn_id : ! ! ! listener_data : ! ! ! user_data : ! ! ! <anchor id="gconf-listeners-new">gconf_listeners_new () GConfListeners* gconf_listeners_new (void); ! ! Returns : ! ! <anchor id="gconf-listeners-free">gconf_listeners_free () void gconf_listeners_free (GConfListeners *listeners); ! ! listeners : ! ! ! <anchor id="gconf-listeners-add">gconf_listeners_add () guint gconf_listeners_add (GConfListeners *listeners, *************** *** 126,173 **** GFreeFunc destroy_notify); ! ! ! ! ! ! listeners : ! ! ! listen_point : ! ! ! listener_data : ! ! ! destroy_notify : ! ! ! Returns : ! ! <anchor id="gconf-listeners-remove">gconf_listeners_remove () void gconf_listeners_remove (GConfListeners *listeners, guint cnxn_id); ! ! ! ! ! ! listeners : ! ! ! cnxn_id : ! ! ! <anchor id="gconf-listeners-notify">gconf_listeners_notify () void gconf_listeners_notify (GConfListeners *listeners, --- 117,156 ---- GFreeFunc destroy_notify); ! ! listeners : ! ! ! listen_point : ! ! ! listener_data : ! ! ! destroy_notify : ! ! ! Returns : ! ! <anchor id="gconf-listeners-remove">gconf_listeners_remove () void gconf_listeners_remove (GConfListeners *listeners, guint cnxn_id); ! ! listeners : ! ! ! cnxn_id : ! ! ! <anchor id="gconf-listeners-notify">gconf_listeners_notify () void gconf_listeners_notify (GConfListeners *listeners, *************** *** 176,219 **** gpointer user_data); ! ! ! ! ! ! listeners : ! ! ! all_above : ! ! ! callback : ! ! ! user_data : ! ! ! <anchor id="gconf-listeners-count">gconf_listeners_count () guint gconf_listeners_count (GConfListeners *listeners); ! ! ! ! ! ! listeners : ! ! ! Returns : ! ! --- 159,194 ---- gpointer user_data); ! ! listeners : ! ! ! all_above : ! ! ! callback : ! ! ! user_data : ! ! ! <anchor id="gconf-listeners-count">gconf_listeners_count () guint gconf_listeners_count (GConfListeners *listeners); ! ! listeners : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-locale.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-locale.sgml *** ./GConf/doc/gconf/sgml/gconf-locale.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-locale.sgml Sat Aug 9 21:12:05 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + *************** *** 33,38 **** --- 34,41 ---- + + Description *************** *** 53,107 **** GConfLocaleCache* gconf_locale_cache_new (void); ! ! ! ! ! ! Returns : ! ! <anchor id="gconf-locale-cache-free">gconf_locale_cache_free () void gconf_locale_cache_free (GConfLocaleCache *cache); ! ! ! ! ! ! cache : ! ! ! <anchor id="gconf-locale-cache-expire">gconf_locale_cache_expire () void gconf_locale_cache_expire (GConfLocaleCache *cache, guint max_age_exclusive_in_seconds); ! ! ! ! ! ! cache : ! ! ! max_age_exclusive_in_seconds : ! ! ! <anchor id="GConfLocaleList">struct GConfLocaleList struct GConfLocaleList { const gchar** list; }; --- 56,99 ---- GConfLocaleCache* gconf_locale_cache_new (void); ! ! Returns : ! ! <anchor id="gconf-locale-cache-free">gconf_locale_cache_free () void gconf_locale_cache_free (GConfLocaleCache *cache); ! ! cache : ! ! ! <anchor id="gconf-locale-cache-expire">gconf_locale_cache_expire () void gconf_locale_cache_expire (GConfLocaleCache *cache, guint max_age_exclusive_in_seconds); ! ! cache : ! ! ! max_age_exclusive_in_seconds : ! ! ! <anchor id="GConfLocaleList">struct GConfLocaleList struct GConfLocaleList { + const gchar** list; }; *************** *** 113,145 **** void gconf_locale_list_ref (GConfLocaleList *list); ! ! ! ! ! ! list : ! ! ! <anchor id="gconf-locale-list-unref">gconf_locale_list_unref () void gconf_locale_list_unref (GConfLocaleList *list); ! ! ! ! ! ! list : ! ! ! <anchor id="gconf-locale-cache-get-list">gconf_locale_cache_get_list () GConfLocaleList* gconf_locale_cache_get_list --- 105,129 ---- void gconf_locale_list_ref (GConfLocaleList *list); ! ! list : ! ! ! <anchor id="gconf-locale-list-unref">gconf_locale_list_unref () void gconf_locale_list_unref (GConfLocaleList *list); ! ! list : ! ! ! <anchor id="gconf-locale-cache-get-list">gconf_locale_cache_get_list () GConfLocaleList* gconf_locale_cache_get_list *************** *** 147,186 **** const gchar *locale); ! ! ! ! ! ! cache : ! ! ! locale : ! ! ! Returns : ! ! <anchor id="gconf-split-locale">gconf_split_locale () gchar** gconf_split_locale (const gchar *locale); ! ! ! ! ! ! locale : ! ! ! Returns : ! ! --- 131,162 ---- const gchar *locale); ! ! cache : ! ! ! locale : ! ! ! Returns : ! ! <anchor id="gconf-split-locale">gconf_split_locale () gchar** gconf_split_locale (const gchar *locale); ! ! locale : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-schema.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-schema.sgml *** ./GConf/doc/gconf/sgml/gconf-schema.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-schema.sgml Sat Aug 9 21:12:04 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + *************** *** 55,60 **** --- 56,63 ---- + + Description *************** *** 75,244 **** GConfSchema* gconf_schema_new (void); ! ! ! ! ! ! Returns : ! ! <anchor id="gconf-schema-free">gconf_schema_free () void gconf_schema_free (GConfSchema *sc); ! ! ! ! ! ! sc : ! ! ! <anchor id="gconf-schema-copy">gconf_schema_copy () GConfSchema* gconf_schema_copy (const GConfSchema *sc); ! ! ! ! ! ! sc : ! ! ! Returns : ! ! <anchor id="gconf-schema-set-type">gconf_schema_set_type () void gconf_schema_set_type (GConfSchema *sc, GConfValueType type); ! ! ! ! ! ! sc : ! ! ! type : ! ! ! <anchor id="gconf-schema-set-locale">gconf_schema_set_locale () void gconf_schema_set_locale (GConfSchema *sc, const gchar *locale); ! ! ! ! ! ! sc : ! ! ! locale : ! ! ! <anchor id="gconf-schema-set-short-desc">gconf_schema_set_short_desc () void gconf_schema_set_short_desc (GConfSchema *sc, const gchar *desc); ! ! ! ! ! ! sc : ! ! ! desc : ! ! ! <anchor id="gconf-schema-set-long-desc">gconf_schema_set_long_desc () void gconf_schema_set_long_desc (GConfSchema *sc, const gchar *desc); ! ! ! ! ! ! sc : ! ! ! desc : ! ! ! <anchor id="gconf-schema-set-owner">gconf_schema_set_owner () void gconf_schema_set_owner (GConfSchema *sc, const gchar *owner); ! ! ! ! ! ! sc : ! ! ! owner : ! ! ! <anchor id="gconf-schema-set-default-value">gconf_schema_set_default_value () void gconf_schema_set_default_value (GConfSchema *sc, const GConfValue *val); ! ! ! ! ! ! sc : ! ! ! val : ! ! ! <anchor id="gconf-schema-set-default-value-nocopy">gconf_schema_set_default_value_nocopy () void gconf_schema_set_default_value_nocopy --- 78,211 ---- GConfSchema* gconf_schema_new (void); ! ! Returns : ! ! <anchor id="gconf-schema-free">gconf_schema_free () void gconf_schema_free (GConfSchema *sc); ! ! sc : ! ! ! <anchor id="gconf-schema-copy">gconf_schema_copy () GConfSchema* gconf_schema_copy (const GConfSchema *sc); ! ! sc : ! ! ! Returns : ! ! <anchor id="gconf-schema-set-type">gconf_schema_set_type () void gconf_schema_set_type (GConfSchema *sc, GConfValueType type); ! ! sc : ! ! ! type : ! ! ! <anchor id="gconf-schema-set-locale">gconf_schema_set_locale () void gconf_schema_set_locale (GConfSchema *sc, const gchar *locale); ! ! sc : ! ! ! locale : ! ! ! <anchor id="gconf-schema-set-short-desc">gconf_schema_set_short_desc () void gconf_schema_set_short_desc (GConfSchema *sc, const gchar *desc); ! ! sc : ! ! ! desc : ! ! ! <anchor id="gconf-schema-set-long-desc">gconf_schema_set_long_desc () void gconf_schema_set_long_desc (GConfSchema *sc, const gchar *desc); ! ! sc : ! ! ! desc : ! ! ! <anchor id="gconf-schema-set-owner">gconf_schema_set_owner () void gconf_schema_set_owner (GConfSchema *sc, const gchar *owner); ! ! sc : ! ! ! owner : ! ! ! <anchor id="gconf-schema-set-default-value">gconf_schema_set_default_value () void gconf_schema_set_default_value (GConfSchema *sc, const GConfValue *val); ! ! sc : ! ! ! val : ! ! ! <anchor id="gconf-schema-set-default-value-nocopy">gconf_schema_set_default_value_nocopy () void gconf_schema_set_default_value_nocopy *************** *** 246,469 **** GConfValue *val); ! ! ! ! ! ! sc : ! ! ! val : ! ! ! <anchor id="gconf-schema-get-type">gconf_schema_get_type () GConfValueType gconf_schema_get_type (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-locale">gconf_schema_get_locale () const char* gconf_schema_get_locale (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-short-desc">gconf_schema_get_short_desc () const char* gconf_schema_get_short_desc (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-long-desc">gconf_schema_get_long_desc () const char* gconf_schema_get_long_desc (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-owner">gconf_schema_get_owner () const char* gconf_schema_get_owner (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-default-value">gconf_schema_get_default_value () GConfValue* gconf_schema_get_default_value (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-car-type">gconf_schema_get_car_type () GConfValueType gconf_schema_get_car_type (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-cdr-type">gconf_schema_get_cdr_type () GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-get-list-type">gconf_schema_get_list_type () GConfValueType gconf_schema_get_list_type (const GConfSchema *schema); ! ! ! ! ! ! schema : ! ! ! Returns : ! ! <anchor id="gconf-schema-set-car-type">gconf_schema_set_car_type () void gconf_schema_set_car_type (GConfSchema *sc, GConfValueType type); ! ! ! ! ! ! sc : ! ! ! type : ! ! ! <anchor id="gconf-schema-set-cdr-type">gconf_schema_set_cdr_type () void gconf_schema_set_cdr_type (GConfSchema *sc, GConfValueType type); ! ! ! ! ! ! sc : ! ! ! type : ! ! ! <anchor id="gconf-schema-set-list-type">gconf_schema_set_list_type () void gconf_schema_set_list_type (GConfSchema *sc, GConfValueType type); ! ! ! ! ! ! sc : ! ! ! type : ! ! ! --- 213,402 ---- GConfValue *val); ! ! sc : ! ! ! val : ! ! ! <anchor id="gconf-schema-get-type">gconf_schema_get_type () GConfValueType gconf_schema_get_type (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-locale">gconf_schema_get_locale () const char* gconf_schema_get_locale (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-short-desc">gconf_schema_get_short_desc () const char* gconf_schema_get_short_desc (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-long-desc">gconf_schema_get_long_desc () const char* gconf_schema_get_long_desc (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-owner">gconf_schema_get_owner () const char* gconf_schema_get_owner (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-default-value">gconf_schema_get_default_value () GConfValue* gconf_schema_get_default_value (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-car-type">gconf_schema_get_car_type () GConfValueType gconf_schema_get_car_type (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-cdr-type">gconf_schema_get_cdr_type () GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-get-list-type">gconf_schema_get_list_type () GConfValueType gconf_schema_get_list_type (const GConfSchema *schema); ! ! schema : ! ! ! Returns : ! ! ! ! <anchor id="gconf-schema-set-car-type">gconf_schema_set_car_type () void gconf_schema_set_car_type (GConfSchema *sc, GConfValueType type); ! ! sc : ! ! ! type : ! ! ! <anchor id="gconf-schema-set-cdr-type">gconf_schema_set_cdr_type () void gconf_schema_set_cdr_type (GConfSchema *sc, GConfValueType type); ! ! sc : ! ! ! type : ! ! ! <anchor id="gconf-schema-set-list-type">gconf_schema_set_list_type () void gconf_schema_set_list_type (GConfSchema *sc, GConfValueType type); ! ! sc : ! ! ! type : ! ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-sources.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-sources.sgml *** ./GConf/doc/gconf/sgml/gconf-sources.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-sources.sgml Sat Aug 9 21:12:04 2003 *************** *** 10,15 **** --- 10,16 ---- Synopsis + *************** *** 76,81 **** --- 77,84 ---- + + Description *************** *** 88,93 **** --- 91,97 ---- <anchor id="GConfSource">struct GConfSource struct GConfSource { + guint flags; gchar* address; GConfBackend* backend; *************** *** 118,158 **** GError **err); ! ! ! ! ! ! address : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-source-free">gconf_source_free () void gconf_source_free (GConfSource *source); ! ! ! ! ! ! source : ! ! ! <anchor id="GConfSources">struct GConfSources struct GConfSources { GList* sources; }; --- 122,155 ---- GError **err); ! ! address : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-source-free">gconf_source_free () void gconf_source_free (GConfSource *source); ! ! source : ! ! ! <anchor id="GConfSources">struct GConfSources struct GConfSources { + GList* sources; }; *************** *** 167,222 **** GError **err); ! ! ! ! ! ! addresses : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-new-from-source">gconf_sources_new_from_source () GConfSources* gconf_sources_new_from_source (GConfSource *source); ! ! ! ! ! ! source : ! ! ! Returns : ! ! <anchor id="gconf-sources-free">gconf_sources_free () void gconf_sources_free (GConfSources *sources); ! ! ! ! ! ! sources : ! ! ! <anchor id="gconf-sources-query-value">gconf_sources_query_value () GConfValue* gconf_sources_query_value (GConfSources *sources, --- 164,207 ---- GError **err); ! ! addresses : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-new-from-source">gconf_sources_new_from_source () GConfSources* gconf_sources_new_from_source (GConfSource *source); ! ! source : ! ! ! Returns : ! ! <anchor id="gconf-sources-free">gconf_sources_free () void gconf_sources_free (GConfSources *sources); ! ! sources : ! ! ! <anchor id="gconf-sources-query-value">gconf_sources_query_value () GConfValue* gconf_sources_query_value (GConfSources *sources, *************** *** 229,268 **** GError **err); ! ! ! ! ! ! sources : ! ! ! key : ! ! ! locales : ! ! ! use_schema_default : ! ! ! value_is_default : ! ! ! value_is_writable : ! ! ! schema_name : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-set-value">gconf_sources_set_value () void gconf_sources_set_value (GConfSources *sources, --- 214,249 ---- GError **err); ! ! sources : ! ! ! key : ! ! ! locales : ! ! ! use_schema_default : ! ! ! value_is_default : ! ! ! value_is_writable : ! ! ! schema_name : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-set-value">gconf_sources_set_value () void gconf_sources_set_value (GConfSources *sources, *************** *** 271,296 **** GError **err); ! ! ! ! ! ! sources : ! ! ! key : ! ! ! value : ! ! ! err : ! ! ! <anchor id="gconf-sources-unset-value">gconf_sources_unset_value () void gconf_sources_unset_value (GConfSources *sources, --- 252,273 ---- GError **err); ! ! sources : ! ! ! key : ! ! ! value : ! ! ! err : ! ! ! <anchor id="gconf-sources-unset-value">gconf_sources_unset_value () void gconf_sources_unset_value (GConfSources *sources, *************** *** 299,324 **** GError **err); ! ! ! ! ! ! sources : ! ! ! key : ! ! ! locale : ! ! ! err : ! ! ! <anchor id="gconf-sources-all-entries">gconf_sources_all_entries () GSList* gconf_sources_all_entries (GConfSources *sources, --- 276,297 ---- GError **err); ! ! sources : ! ! ! key : ! ! ! locale : ! ! ! err : ! ! ! <anchor id="gconf-sources-all-entries">gconf_sources_all_entries () GSList* gconf_sources_all_entries (GConfSources *sources, *************** *** 327,354 **** GError **err); ! ! ! ! ! ! sources : ! ! ! dir : ! ! ! locales : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-all-dirs">gconf_sources_all_dirs () GSList* gconf_sources_all_dirs (GConfSources *sources, --- 300,323 ---- GError **err); ! ! sources : ! ! ! dir : ! ! ! locales : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-all-dirs">gconf_sources_all_dirs () GSList* gconf_sources_all_dirs (GConfSources *sources, *************** *** 356,380 **** GError **err); ! ! ! ! ! ! sources : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-dir-exists">gconf_sources_dir_exists () gboolean gconf_sources_dir_exists (GConfSources *sources, --- 325,345 ---- GError **err); ! ! sources : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-dir-exists">gconf_sources_dir_exists () gboolean gconf_sources_dir_exists (GConfSources *sources, *************** *** 382,406 **** GError **err); ! ! ! ! ! ! sources : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-remove-dir">gconf_sources_remove_dir () void gconf_sources_remove_dir (GConfSources *sources, --- 347,367 ---- GError **err); ! ! sources : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-remove-dir">gconf_sources_remove_dir () void gconf_sources_remove_dir (GConfSources *sources, *************** *** 408,430 **** GError **err); ! ! ! ! ! ! sources : ! ! ! dir : ! ! ! err : ! ! ! <anchor id="gconf-sources-set-schema">gconf_sources_set_schema () void gconf_sources_set_schema (GConfSources *sources, --- 369,387 ---- GError **err); ! ! sources : ! ! ! dir : ! ! ! err : ! ! ! <anchor id="gconf-sources-set-schema">gconf_sources_set_schema () void gconf_sources_set_schema (GConfSources *sources, *************** *** 433,480 **** GError **err); ! ! ! ! ! ! sources : ! ! ! key : ! ! ! schema_key : ! ! ! err : ! ! ! <anchor id="gconf-sources-sync-all">gconf_sources_sync_all () gboolean gconf_sources_sync_all (GConfSources *sources, GError **err); ! ! ! ! ! ! sources : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-query-metainfo">gconf_sources_query_metainfo () GConfMetaInfo* gconf_sources_query_metainfo (GConfSources *sources, --- 390,429 ---- GError **err); ! ! sources : ! ! ! key : ! ! ! schema_key : ! ! ! err : ! ! ! <anchor id="gconf-sources-sync-all">gconf_sources_sync_all () gboolean gconf_sources_sync_all (GConfSources *sources, GError **err); ! ! sources : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-query-metainfo">gconf_sources_query_metainfo () GConfMetaInfo* gconf_sources_query_metainfo (GConfSources *sources, *************** *** 482,506 **** GError **err); ! ! ! ! ! ! sources : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-query-default-value">gconf_sources_query_default_value () GConfValue* gconf_sources_query_default_value --- 431,451 ---- GError **err); ! ! sources : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-sources-query-default-value">gconf_sources_query_default_value () GConfValue* gconf_sources_query_default_value *************** *** 511,541 **** GError **err); ! ! ! ! ! ! sources : ! ! ! key : ! ! ! locales : ! ! ! is_writable : ! ! ! err : ! ! ! Returns : ! ! --- 456,482 ---- GError **err); ! ! sources : ! ! ! key : ! ! ! locales : ! ! ! is_writable : ! ! ! err : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/gconf-value.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-value.sgml *** ./GConf/doc/gconf/sgml/gconf-value.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf-value.sgml Sat Aug 9 21:12:05 2003 *************** *** 1,17 **** ! GConfValue, GConfEntry, GConfMetaInfo 3 GCONF Library ! GConfValue, GConfEntry, GConfMetaInfo ! A GConfValue stores a dynamically-typed value. A GConfEntry stores a ! key-value pair. A GConfMetaInfo stores metainformation about a key. Synopsis --- 1,16 ---- ! gconf-value 3 GCONF Library ! gconf-value Synopsis + *************** *** 92,116 **** Description - GConfValue stores one of the value types GConf understands; GConf - uses GConfValue to pass values around because it doesn't know the - type of its values at compile time. - - - A GConfEntry pairs a relative key - name with a value, for example if the value "10" is stored at the key - "/foo/bar/baz", the GConfEntry will store "baz" and "10". - - - - A GConfMetaInfo object holds metainformation about a key, such as - its last modification time and the name of the schema associated with - it. You should rarely if ever need to use GConfMetaInfo. - (In fact you can't get the metainfo for a key using the current API.) --- 91,102 ---- + + Description *************** *** 137,801 **** } GConfValueType; ! Used to indicate the type of a GConfValue. ! ! ! ! ! ! ! GCONF_VALUE_INVALID ! Never the type of a GConfValue obtained from GConf functions; used to indicate errors and the like. ! ! ! ! GCONF_VALUE_STRING ! String value (gchar*). ! ! ! ! GCONF_VALUE_INT ! Integer value (gint). ! ! ! ! GCONF_VALUE_FLOAT ! Floating point value (gdouble). ! ! ! ! GCONF_VALUE_BOOL ! Boolean value (gboolean). ! ! ! ! GCONF_VALUE_SCHEMA ! Schema value (GConfSchema). ! ! ! ! GCONF_VALUE_LIST ! List of GConfValue; GConfValue elements must have ! a primitive type (i.e. they may not be lists or pairs), and all elements ! of a list must have the same type. ! ! ! ! GCONF_VALUE_PAIR ! Pair of GConfValue; the first field (car) and the second ! field (cdr) may have different types. The two elements of a pair must be primitive ! types, not lists or pairs. ! ! ! ! <anchor id="GConfValue">struct GConfValue struct GConfValue { GConfValueType type; }; - Represents a dynamically-typed value. The type field tells you the - type of the value; the other fields should be accessed with the - accessor functions and macros. - ! ! A GConfValue should always ! be initialized before use. That is, you should not use a GConfValue ! unless you have called one of the functions beginning with ! "gconf_value_set_".. For lists, initialization has two ! steps: first you must set the list element type, then you must set the ! list value. ! ! ! ! ! ! ! GConfValueType type ! The GConfValueType of this GConfValue. The only field of ! GConfValue you should access directly. ! ! ! ! <anchor id="GCONF-VALUE-TYPE-VALID-CAPS">GCONF_VALUE_TYPE_VALID() #define GCONF_VALUE_TYPE_VALID(x) (((x) > GCONF_VALUE_INVALID) && ((x) <= GCONF_VALUE_PAIR)) ! ! ! ! ! ! x : ! ! ! <anchor id="gconf-value-new">gconf_value_new () GConfValue* gconf_value_new (GConfValueType type); - Creates a new GConfValue with type type. The type is immutable after - creation; values have a fixed type. You must - initialize the GConfValue after creation; that is, you must set its - value with one of the "setter" functions. - - - - - - type : - type of the new GConfValue. - - Returns :newly-allocated GConfValue. ! ! <anchor id="gconf-value-copy">gconf_value_copy () GConfValue* gconf_value_copy (const GConfValue *src); ! Copies a GConfValue. The copy is a deep copy, that is, any allocated ! memory inside the GConfValue will also be copied. ! ! ! ! ! ! src : ! a GConfValue to copy. ! ! Returns :a newly-allocated GConfValue identical to src. ! ! <anchor id="gconf-value-free">gconf_value_free () void gconf_value_free (GConfValue *value); ! Deallocates a GConfValue. Also deallocates any allocated memory ! inside the GConfValue (such as lists, pair members, strings, and schemas). ! ! ! ! ! ! value : ! a GConfValue to destroy. ! ! <anchor id="gconf-value-get-string">gconf_value_get_string () const char* gconf_value_get_string (const GConfValue *value); - Returns a const gchar* for a GConfValue with type - GCONF_VALUE_STRING. The returned string is not a - copy, don't try to free it. It is "owned" by the GConfValue and will - be destroyed when the GConfValue is destroyed. - ! ! If the GConfValue is not initialized (i.e. no one has called ! gconf_value_set_string()) then the string may be ! NULL, but of course you should not try to use an ! uninitialized GConfValue. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-int">gconf_value_get_int () int gconf_value_get_int (const GConfValue *value); ! Returns a gint for a GConfValue with type GCONF_VALUE_INT. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-float">gconf_value_get_float () double gconf_value_get_float (const GConfValue *value); ! Returns a gdouble for a GConfValue with type GCONF_VALUE_DOUBLE. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-list-type">gconf_value_get_list_type () GConfValueType gconf_value_get_list_type (const GConfValue *value); ! Returns the type of the list elements in a GConfValue with type ! GCONF_VALUE_LIST. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-list">gconf_value_get_list () GSList* gconf_value_get_list (const GConfValue *value); ! Returns a GSList containing GConfValue objects. Each GConfValue in ! the returned list will have the type returned by ! gconf_value_get_list_type(). Remember that the empty GSList is equal to ! NULL. The list is not a copy; it is "owned" by the ! GConfValue and will be destroyed when the GConfValue is destroyed. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-car">gconf_value_get_car () GConfValue* gconf_value_get_car (const GConfValue *value); - Returns the first member (car) of a GConfValue with type - GCONF_VALUE_PAIR. The car is another GConfValue, with a primitive - type (bool, int, float, string, schema). - ! ! The returned value is not a copy; it is "owned" by the pair and will ! be destroyed when the pair is destroyed. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-cdr">gconf_value_get_cdr () GConfValue* gconf_value_get_cdr (const GConfValue *value); - Returns the second member (cdr) of a GConfValue with type - GCONF_VALUE_PAIR. The cdr is another GConfValue, with a primitive - type (bool, int, float, string, schema). - ! ! The returned value is not a copy; it is "owned" by the pair and will ! be destroyed when the pair is destroyed. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-bool">gconf_value_get_bool () gboolean gconf_value_get_bool (const GConfValue *value); ! Returns a gboolean for a GConfValue with type GCONF_VALUE_BOOL. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-get-schema">gconf_value_get_schema () GConfSchema* gconf_value_get_schema (const GConfValue *value); - Returns a GConfSchema for a GConfValue with type - GCONF_VALUE_SCHEMA. If the GConfValue is uninitialized, it - may return NULL; but of course you should have - initialized the GConfValue. The GConf library will not return values - with a NULL schema. - ! ! The returned value is not a copy; it is "owned" by the GConfValue and will ! be destroyed when the GConfValue is destroyed. ! ! ! ! ! ! value : ! ! ! Returns : ! ! <anchor id="gconf-value-set-int">gconf_value_set_int () void gconf_value_set_int (GConfValue *value, gint the_int); ! Sets the value of a GConfValue with type GCONF_VALUE_INT. ! ! ! ! ! ! value : ! a GConfValue of type GCONF_VALUE_INT. ! ! the_int : ! the integer. ! ! <anchor id="gconf-value-set-string">gconf_value_set_string () void gconf_value_set_string (GConfValue *value, const gchar *the_str); - Sets the value of a GConfValue with type - GCONF_VALUE_STRING. the_str is copied. - - - - - - value : - a GConfValue of type GCONF_VALUE_STRING. - - the_str : - the string. ! ! <anchor id="gconf-value-set-float">gconf_value_set_float () void gconf_value_set_float (GConfValue *value, gdouble the_float); ! Sets the value of a GConfValue with type ! GCONF_VALUE_FLOAT. ! ! ! ! ! ! value : ! a GConfValue of type GCONF_VALUE_FLOAT. ! ! the_float : ! the floating point number. ! ! <anchor id="gconf-value-set-bool">gconf_value_set_bool () void gconf_value_set_bool (GConfValue *value, gboolean the_bool); ! Sets the value of a GConfValue with type ! GCONF_VALUE_BOOL. ! ! ! ! ! ! value : ! a GConfValue of type GCONF_VALUE_BOOL. ! ! the_bool : ! a boolean value (TRUE or FALSE). ! ! <anchor id="gconf-value-set-schema">gconf_value_set_schema () void gconf_value_set_schema (GConfValue *value, const GConfSchema *sc); - Sets the value of a GConfValue with type GCONF_VALUE_SCHEMA. The - GConfSchema is copied. Alternatively you can use - gconf_value_set_schema_nocopy(). - - - - - - value : - a GConfValue with type GCONF_VALUE_SCHEMA. - - sc : - the GConfSchema. ! ! <anchor id="gconf-value-set-schema-nocopy">gconf_value_set_schema_nocopy () void gconf_value_set_schema_nocopy (GConfValue *value, GConfSchema *sc); ! Sets the value of a GConfValue with type ! GCONF_VALUE_SCHEMA. The GConfSchema is not ! copied; the GConfValue takes ownership of it, and it should only be ! accessed via the gconf_value_get_schema() macro. This function is provided ! as a more efficient version of gconf_value_set_schema(). ! ! ! ! ! ! value : ! a GConfValue with type GCONF_VALUE_SCHEMA. ! ! sc : ! the GConfSchema. ! ! <anchor id="gconf-value-set-car">gconf_value_set_car () void gconf_value_set_car (GConfValue *value, const GConfValue *car); - Sets the value of the first field (car) of a GConfValue with type - GCONF_VALUE_PAIR. The GConfValue is copied. Alternatively, use - gconf_value_set_car_nocopy(). - - - - - - value : - a GConfValue with type GCONF_VALUE_PAIR. - - car : - the GConfValue to set as the car of the pair. ! ! <anchor id="gconf-value-set-car-nocopy">gconf_value_set_car_nocopy () void gconf_value_set_car_nocopy (GConfValue *value, GConfValue *car); ! Sets the value of the first field (car) of a GConfValue with type ! GCONF_VALUE_PAIR. The GConfValue is not copied; ! the GConfValue takes ownership of it. Alternatively, use ! gconf_value_set_car(). ! ! ! ! ! ! value : ! a GConfValue with type GCONF_VALUE_PAIR. ! ! car : ! the GConfValue to set as the car of the pair. ! ! <anchor id="gconf-value-set-cdr">gconf_value_set_cdr () void gconf_value_set_cdr (GConfValue *value, const GConfValue *cdr); ! Sets the value of the second field (cdr) of a GConfValue with type ! GCONF_VALUE_PAIR. The GConfValue is copied. Alternatively, use ! gconf_value_set_cdr_nocopy(). ! ! ! ! ! ! value : ! a GConfValue with type GCONF_VALUE_PAIR. ! ! cdr : ! the GConfValue to set as the cdr of the pair. ! ! <anchor id="gconf-value-set-cdr-nocopy">gconf_value_set_cdr_nocopy () void gconf_value_set_cdr_nocopy (GConfValue *value, GConfValue *cdr); - Sets the value of the second field (cdr) of a GConfValue with type - GCONF_VALUE_PAIR. The GConfValue is not copied; - the GConfValue takes ownership of it. Alternatively, use - gconf_value_set_cdr(). - - - - - - value : - a GConfValue with type GCONF_VALUE_PAIR. - - cdr : - the GConfValue to set as the cdr of the pair. ! ! <anchor id="gconf-value-set-list-type">gconf_value_set_list_type () void gconf_value_set_list_type (GConfValue *value, GConfValueType type); ! Sets the type of the elements in a GConfValue of type ! GCONF_VALUE_LIST. All the elements in the list must have the same ! type. You must set the list type before you can set the list value. ! ! ! ! ! ! value : ! a GConfValue with type GCONF_VALUE_LIST. ! ! type : ! the type of elements in this list. ! ! <anchor id="gconf-value-set-list-nocopy">gconf_value_set_list_nocopy () void gconf_value_set_list_nocopy (GConfValue *value, GSList *list); - Sets the value of a GConfValue with type GCONF_VALUE_LIST. The - list argument should be a GSList of GConfValue. Each GConfValue in - the list must have the same type, and this type must be specified in - advance with gconf_value_set_list_type(). This function does - not copy the list; the GConfValue will take - ownership of the list and its contents, and they will be destroyed - when the GConfValue is destroyed. Alternatively, use - gconf_value_set_list() to make a copy. - - - - - - value : - a GConfValue with type GCONF_VALUE_LIST. - - list : - the GSList of GConfValue to set as the list value. ! ! <anchor id="gconf-value-set-list">gconf_value_set_list () void gconf_value_set_list (GConfValue *value, GSList *list); ! Sets the value of a GConfValue with type GCONF_VALUE_LIST. The ! list argument should be a GSList of GConfValue. Each GConfValue in ! the list must have the same type, and this type must be specified in ! advance with gconf_value_set_list_type(). This function copies the ! list; it will not modify the list argument. ! ! ! ! ! ! value : ! a GConfValue with type GCONF_VALUE_LIST. ! ! list : ! the GSList of GConfValue to set as the list value. ! ! <anchor id="gconf-value-to-string">gconf_value_to_string () gchar* gconf_value_to_string (const GConfValue *value); ! Creates a human-readable string representation of a GConfValue. This ! is intended for debugging and the like; the string representation is ! not suitable for reliable machine parsing (that is, you shouldn't use ! this function to save a value to a file or anything like that). The ! exact nature of the string representation may change in future ! versions. The returned string is newly-allocated and must be freed ! with g_free(). ! ! ! ! ! ! value : ! a GConfValue. ! ! Returns :a newly-allocated string representing the GConfValue. ! ! <anchor id="GConfMetaInfo">struct GConfMetaInfo struct GConfMetaInfo { gchar* schema; gchar* mod_user; /* user owning the daemon that made the last modification */ GTime mod_time; /* time of the modification */ --- 123,545 ---- } GConfValueType; ! ! <anchor id="GConfValue">struct GConfValue struct GConfValue { + GConfValueType type; }; ! <anchor id="GCONF-VALUE-TYPE-VALID-CAPS">GCONF_VALUE_TYPE_VALID() #define GCONF_VALUE_TYPE_VALID(x) (((x) > GCONF_VALUE_INVALID) && ((x) <= GCONF_VALUE_PAIR)) ! ! x : ! ! ! <anchor id="gconf-value-new">gconf_value_new () GConfValue* gconf_value_new (GConfValueType type); + + type : + + + Returns : ! ! ! <anchor id="gconf-value-copy">gconf_value_copy () GConfValue* gconf_value_copy (const GConfValue *src); ! ! ! src : ! ! ! Returns : ! ! <anchor id="gconf-value-free">gconf_value_free () void gconf_value_free (GConfValue *value); ! ! ! value : ! ! ! <anchor id="gconf-value-get-string">gconf_value_get_string () const char* gconf_value_get_string (const GConfValue *value); ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-int">gconf_value_get_int () int gconf_value_get_int (const GConfValue *value); ! ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-float">gconf_value_get_float () double gconf_value_get_float (const GConfValue *value); ! ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-list-type">gconf_value_get_list_type () GConfValueType gconf_value_get_list_type (const GConfValue *value); ! ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-list">gconf_value_get_list () GSList* gconf_value_get_list (const GConfValue *value); ! ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-car">gconf_value_get_car () GConfValue* gconf_value_get_car (const GConfValue *value); ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-cdr">gconf_value_get_cdr () GConfValue* gconf_value_get_cdr (const GConfValue *value); ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-bool">gconf_value_get_bool () gboolean gconf_value_get_bool (const GConfValue *value); ! ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-get-schema">gconf_value_get_schema () GConfSchema* gconf_value_get_schema (const GConfValue *value); ! ! value : ! ! ! Returns : ! ! ! ! <anchor id="gconf-value-set-int">gconf_value_set_int () void gconf_value_set_int (GConfValue *value, gint the_int); ! ! ! value : ! ! ! the_int : ! ! ! <anchor id="gconf-value-set-string">gconf_value_set_string () void gconf_value_set_string (GConfValue *value, const gchar *the_str); + + value : + + + the_str : + ! ! ! <anchor id="gconf-value-set-float">gconf_value_set_float () void gconf_value_set_float (GConfValue *value, gdouble the_float); ! ! ! value : ! ! ! the_float : ! ! ! <anchor id="gconf-value-set-bool">gconf_value_set_bool () void gconf_value_set_bool (GConfValue *value, gboolean the_bool); ! ! ! value : ! ! ! the_bool : ! ! ! <anchor id="gconf-value-set-schema">gconf_value_set_schema () void gconf_value_set_schema (GConfValue *value, const GConfSchema *sc); + + value : + + + sc : + ! ! ! <anchor id="gconf-value-set-schema-nocopy">gconf_value_set_schema_nocopy () void gconf_value_set_schema_nocopy (GConfValue *value, GConfSchema *sc); ! ! ! value : ! ! ! sc : ! ! ! <anchor id="gconf-value-set-car">gconf_value_set_car () void gconf_value_set_car (GConfValue *value, const GConfValue *car); + + value : + + + car : + ! ! ! <anchor id="gconf-value-set-car-nocopy">gconf_value_set_car_nocopy () void gconf_value_set_car_nocopy (GConfValue *value, GConfValue *car); ! ! ! value : ! ! ! car : ! ! ! <anchor id="gconf-value-set-cdr">gconf_value_set_cdr () void gconf_value_set_cdr (GConfValue *value, const GConfValue *cdr); ! ! ! value : ! ! ! cdr : ! ! ! <anchor id="gconf-value-set-cdr-nocopy">gconf_value_set_cdr_nocopy () void gconf_value_set_cdr_nocopy (GConfValue *value, GConfValue *cdr); + + value : + + + cdr : + ! ! ! <anchor id="gconf-value-set-list-type">gconf_value_set_list_type () void gconf_value_set_list_type (GConfValue *value, GConfValueType type); ! ! ! value : ! ! ! type : ! ! ! <anchor id="gconf-value-set-list-nocopy">gconf_value_set_list_nocopy () void gconf_value_set_list_nocopy (GConfValue *value, GSList *list); + + value : + + + list : + ! ! ! <anchor id="gconf-value-set-list">gconf_value_set_list () void gconf_value_set_list (GConfValue *value, GSList *list); ! ! ! value : ! ! ! list : ! ! ! <anchor id="gconf-value-to-string">gconf_value_to_string () gchar* gconf_value_to_string (const GConfValue *value); ! ! ! value : ! ! ! Returns : ! ! <anchor id="GConfMetaInfo">struct GConfMetaInfo struct GConfMetaInfo { + gchar* schema; gchar* mod_user; /* user owning the daemon that made the last modification */ GTime mod_time; /* time of the modification */ *************** *** 809,1173 **** GConfMetaInfo* gconf_meta_info_new (void); ! ! ! ! ! ! Returns : ! ! <anchor id="gconf-meta-info-free">gconf_meta_info_free () void gconf_meta_info_free (GConfMetaInfo *gcmi); ! ! ! ! ! ! gcmi : ! ! ! <anchor id="gconf-meta-info-get-schema">gconf_meta_info_get_schema () const char* gconf_meta_info_get_schema (GConfMetaInfo *gcmi); ! ! ! ! ! ! gcmi : ! ! ! Returns : ! ! <anchor id="gconf-meta-info-get-mod-user">gconf_meta_info_get_mod_user () const char* gconf_meta_info_get_mod_user (GConfMetaInfo *gcmi); ! ! ! ! ! ! gcmi : ! ! ! Returns : ! ! <anchor id="gconf-meta-info-mod-time">gconf_meta_info_mod_time () GTime gconf_meta_info_mod_time (GConfMetaInfo *gcmi); ! ! ! ! ! ! gcmi : ! ! ! Returns : ! ! <anchor id="gconf-meta-info-set-schema">gconf_meta_info_set_schema () void gconf_meta_info_set_schema (GConfMetaInfo *gcmi, const gchar *schema_name); ! ! ! ! ! ! gcmi : ! ! ! schema_name : ! ! ! <anchor id="gconf-meta-info-set-mod-user">gconf_meta_info_set_mod_user () void gconf_meta_info_set_mod_user (GConfMetaInfo *gcmi, const gchar *mod_user); ! ! ! ! ! ! gcmi : ! ! ! mod_user : ! ! ! <anchor id="gconf-meta-info-set-mod-time">gconf_meta_info_set_mod_time () void gconf_meta_info_set_mod_time (GConfMetaInfo *gcmi, GTime mod_time); ! ! ! ! ! ! gcmi : ! ! ! mod_time : ! ! ! <anchor id="GConfEntry">struct GConfEntry struct GConfEntry { char *key; GConfValue *value; }; - Stores an entry from a GConf "directory," including a key-value pair, - the name of the schema applicable to this entry, whether the value is - a default value, and whether GConf can write a new value at this - key. key should be an absolute key, not a relative key. (Note that - internally GConf breaks this rule sometimes; but in the public - interface, key is always an absolute key.) To access the key and - value, use gconf_entry_get_key() and gconf_entry_get_value(). - ! Value can be NULL, indicating that the ! value is not set. ! ! ! ! ! ! char *key ! an absolute key name ! ! ! ! GConfValue *value ! ! ! ! ! <anchor id="gconf-entry-new-nocopy">gconf_entry_new_nocopy () GConfEntry* gconf_entry_new_nocopy (gchar *key, GConfValue *val); ! Creates a new GConfEntry with key key and value val. key should be a full ! path to the key, starting with '/'. Neither the key nor the value is copied; ! both are freed when the GConfEntry is freed. The string will be freed with ! g_free() so should be allocated with a GLib function, not malloc(). ! ! ! ! ! ! key : ! the key name ! ! val : ! the value ! ! Returns :a new GConfentry. ! ! <anchor id="gconf-entry-free">gconf_entry_free () void gconf_entry_free (GConfEntry *entry); - Destroys a GConfEntry, freeing the key, the value, and the entry itself. - - - - - - entry : - a GConfEntry to free. ! ! <anchor id="gconf-entry-get-key">gconf_entry_get_key () const char* gconf_entry_get_key (const GConfEntry *entry); ! Accesses the key field of a GConfEntry. The returned key is not a ! copy, and should not be freed or modified. ! ! ! ! ! ! entry : ! ! ! Returns : ! ! <anchor id="gconf-entry-get-value">gconf_entry_get_value () GConfValue* gconf_entry_get_value (const GConfEntry *entry); ! Accesses the value field of a GConfEntry. The returned value is not ! a copy, and should not be freed or modified. If you have called ! gconf_entry_steal_value(), the returned value will be ! NULL. ! ! ! ! ! ! entry : ! ! ! Returns : ! ! <anchor id="gconf-entry-steal-value">gconf_entry_steal_value () GConfValue* gconf_entry_steal_value (GConfEntry *entry); - Extracts the value from a GConfEntry, leaving the value field in - GConfEntry set to NULL. Destroying the GConfEntry - will not destroy the value; the caller of - gconf_entry_steal_value() assumes ownership of it. - - - - - - entry : - a GConfEntry. - - Returns :a GConfValue that the caller must free. ! ! <anchor id="gconf-entry-get-is-default">gconf_entry_get_is_default () gboolean gconf_entry_get_is_default (const GConfEntry *entry); ! ! ! ! ! ! entry : ! ! ! Returns : ! ! <anchor id="gconf-entry-get-schema-name">gconf_entry_get_schema_name () const char* gconf_entry_get_schema_name (const GConfEntry *entry); ! ! ! ! ! ! entry : ! ! ! Returns : ! ! <anchor id="gconf-entry-set-is-default">gconf_entry_set_is_default () void gconf_entry_set_is_default (GConfEntry *entry, gboolean is_default); ! ! ! ! ! ! entry : ! ! ! is_default : ! ! ! <anchor id="gconf-entry-set-schema-name">gconf_entry_set_schema_name () void gconf_entry_set_schema_name (GConfEntry *entry, const gchar *name); ! ! ! ! ! ! entry : ! ! ! name : ! ! ! <anchor id="gconf-entry-set-value-nocopy">gconf_entry_set_value_nocopy () void gconf_entry_set_value_nocopy (GConfEntry *entry, GConfValue *val); ! ! ! ! ! ! entry : ! ! ! val : ! ! ! --- 553,825 ---- GConfMetaInfo* gconf_meta_info_new (void); ! ! Returns : ! ! <anchor id="gconf-meta-info-free">gconf_meta_info_free () void gconf_meta_info_free (GConfMetaInfo *gcmi); ! ! gcmi : ! ! ! <anchor id="gconf-meta-info-get-schema">gconf_meta_info_get_schema () const char* gconf_meta_info_get_schema (GConfMetaInfo *gcmi); ! ! gcmi : ! ! ! Returns : ! ! ! ! <anchor id="gconf-meta-info-get-mod-user">gconf_meta_info_get_mod_user () const char* gconf_meta_info_get_mod_user (GConfMetaInfo *gcmi); ! ! gcmi : ! ! ! Returns : ! ! ! ! <anchor id="gconf-meta-info-mod-time">gconf_meta_info_mod_time () GTime gconf_meta_info_mod_time (GConfMetaInfo *gcmi); ! ! gcmi : ! ! ! Returns : ! ! ! ! <anchor id="gconf-meta-info-set-schema">gconf_meta_info_set_schema () void gconf_meta_info_set_schema (GConfMetaInfo *gcmi, const gchar *schema_name); ! ! gcmi : ! ! ! schema_name : ! ! ! <anchor id="gconf-meta-info-set-mod-user">gconf_meta_info_set_mod_user () void gconf_meta_info_set_mod_user (GConfMetaInfo *gcmi, const gchar *mod_user); ! ! gcmi : ! ! ! mod_user : ! ! ! <anchor id="gconf-meta-info-set-mod-time">gconf_meta_info_set_mod_time () void gconf_meta_info_set_mod_time (GConfMetaInfo *gcmi, GTime mod_time); ! ! gcmi : ! ! ! mod_time : ! ! ! <anchor id="GConfEntry">struct GConfEntry struct GConfEntry { + char *key; GConfValue *value; }; ! <anchor id="gconf-entry-new-nocopy">gconf_entry_new_nocopy () GConfEntry* gconf_entry_new_nocopy (gchar *key, GConfValue *val); ! ! ! key : ! ! ! val : ! ! ! Returns : ! ! <anchor id="gconf-entry-free">gconf_entry_free () void gconf_entry_free (GConfEntry *entry); + + entry : + ! ! ! <anchor id="gconf-entry-get-key">gconf_entry_get_key () const char* gconf_entry_get_key (const GConfEntry *entry); ! ! ! entry : ! ! ! Returns : ! ! ! ! <anchor id="gconf-entry-get-value">gconf_entry_get_value () GConfValue* gconf_entry_get_value (const GConfEntry *entry); ! ! ! entry : ! ! ! Returns : ! ! ! ! <anchor id="gconf-entry-steal-value">gconf_entry_steal_value () GConfValue* gconf_entry_steal_value (GConfEntry *entry); + + entry : + + + Returns : ! ! ! <anchor id="gconf-entry-get-is-default">gconf_entry_get_is_default () gboolean gconf_entry_get_is_default (const GConfEntry *entry); ! ! entry : ! ! ! Returns : ! ! ! ! <anchor id="gconf-entry-get-schema-name">gconf_entry_get_schema_name () const char* gconf_entry_get_schema_name (const GConfEntry *entry); ! ! entry : ! ! ! Returns : ! ! ! ! <anchor id="gconf-entry-set-is-default">gconf_entry_set_is_default () void gconf_entry_set_is_default (GConfEntry *entry, gboolean is_default); ! ! entry : ! ! ! is_default : ! ! ! <anchor id="gconf-entry-set-schema-name">gconf_entry_set_schema_name () void gconf_entry_set_schema_name (GConfEntry *entry, const gchar *name); ! ! entry : ! ! ! name : ! ! ! <anchor id="gconf-entry-set-value-nocopy">gconf_entry_set_value_nocopy () void gconf_entry_set_value_nocopy (GConfEntry *entry, GConfValue *val); ! ! entry : ! ! ! val : ! ! ! diff -crN ./GConf/doc/gconf/sgml/gconf.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf.sgml *** ./GConf/doc/gconf/sgml/gconf.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/gconf.sgml Sat Aug 9 21:12:05 2003 *************** *** 1,18 **** ! ! GConf Core Interfaces 3 GCONF Library ! ! GConf Core Interfaces ! Basic functions to initialize GConf and get/set values Synopsis --- 1,16 ---- ! gconf 3 GCONF Library ! gconf Synopsis + *************** *** 153,172 **** Description - These functions initialize GConf, and communicate with the - gconfd server via a - GConfEngine object. You can install a notification - request on the server, get values, set values, list directories, and associate - schema names with keys. - - - Most of this interface is replicated in the GtkObject wrapper - (GConfClient object); an alternative to the value-setting functions - is the GConfChangeSet interface. --- 151,162 ---- + + Description *************** *** 177,280 **** gboolean gconf_init (int argc, char **argv, GError **err); ! - gconf_init is deprecated and should not be used in newly-written code. - - - - Initializes the GConf library. Creates a connection to a CORBA ORB, and - initializes OAF (the object activation framework) if it isn't already - initialized. - - - - - - argc : - - - argv : - - - err : - the return location for an allocated GError, or NULL to ignore errors. - - Returns :TRUE on success, FALSE otherwise. ! ! <anchor id="gconf-preinit">gconf_preinit () void gconf_preinit (gpointer app, gpointer mod_info); ! ! ! gconf_preinit is deprecated and should not be used in newly-written code. ! ! ! ! ! ! ! ! app : ! ! ! mod_info : ! ! ! <anchor id="gconf-postinit">gconf_postinit () void gconf_postinit (gpointer app, gpointer mod_info); ! ! ! gconf_postinit is deprecated and should not be used in newly-written code. ! ! ! ! ! ! ! ! app : ! ! ! mod_info : ! ! ! <anchor id="gconf-is-initialized">gconf_is_initialized () gboolean gconf_is_initialized (void); ! ! ! gconf_is_initialized is deprecated and should not be used in newly-written code. ! ! ! Asks whether the library has been initialized. ! ! ! ! ! ! Returns :TRUE if the library has been initialized. ! ! <anchor id="GConfNotifyFunc">GConfNotifyFunc () void (*GConfNotifyFunc) (GConfEngine *conf, --- 167,236 ---- gboolean gconf_init (int argc, char **argv, GError **err); ! gconf_init is deprecated and should not be used in newly-written code. + + argc : + + + argv : + + + err : + + + Returns : ! ! ! <anchor id="gconf-preinit">gconf_preinit () void gconf_preinit (gpointer app, gpointer mod_info); ! gconf_preinit is deprecated and should not be used in newly-written code. ! ! app : ! ! ! mod_info : ! ! ! <anchor id="gconf-postinit">gconf_postinit () void gconf_postinit (gpointer app, gpointer mod_info); ! gconf_postinit is deprecated and should not be used in newly-written code. ! ! app : ! ! ! mod_info : ! ! ! <anchor id="gconf-is-initialized">gconf_is_initialized () gboolean gconf_is_initialized (void); ! gconf_is_initialized is deprecated and should not be used in newly-written code. ! ! ! Returns : ! ! <anchor id="GConfNotifyFunc">GConfNotifyFunc () void (*GConfNotifyFunc) (GConfEngine *conf, *************** *** 282,313 **** GConfEntry *entry, gpointer user_data); ! A callback function invoked when a key's value changes. The cnxn_id parameter ! will be the connection ID returned from gconf_engine_notify_add(). key will be the ! full path of the changed key, value will be the new value if the key is set. ! If the key is unset, value will be the default value if one exists, or ! NULL otherwise. is_default indicates whether a value is a ! default setting or a user setting. If value is NULL, ! is_default will be TRUE. user_data is the data passed to ! gconf_engine_notify_add(). ! ! ! ! ! ! conf : ! the GConfEngine passed to gconf_engine_notify_add(). ! ! cnxn_id : ! the ID returned from gconf_engine_notify_add(). ! ! entry : ! ! ! user_data : ! the user data passed to gconf_engine_notify_add(). ! ! <anchor id="gconf-engine-notify-add">gconf_engine_notify_add () guint gconf_engine_notify_add (GConfEngine *conf, --- 238,260 ---- GConfEntry *entry, gpointer user_data); ! ! ! conf : ! ! ! cnxn_id : ! ! ! entry : ! ! ! user_data : ! ! ! ! ! <anchor id="gconf-engine-notify-add">gconf_engine_notify_add () guint gconf_engine_notify_add (GConfEngine *conf, *************** *** 316,407 **** gpointer user_data, GError **err); ! Registers a notification request with the gconfd ! server. The server will notify the client when any key at or below ! namespace_section is set or unset. Try to watch the smallest possible part of ! the namespace; otherwise you will slow down the server and your application with ! unnecessary notifications. Note that you should prefer gconf_client_notify_add() ! if you're using the GtkObject wrapper library, because ! gconf_client_notify_add() does not require a client-server conversation for ! every callback. gconf_engine_notify_add() requests a different server notification for ! every callback. The function returns an ID you can use to remove the ! notification request; 0 is an invalid ID, and is returned if an error occurs. ! ! ! ! ! ! conf : ! a GConfEngine to monitor for changes. ! ! namespace_section : ! the directory or key to watch; you will be notified of changes at or below this point. ! ! func : ! the callback to invoke when a notification is received from the server. ! ! user_data : ! the data to pass to the callback. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :an ID for the notification request, or 0 on error. ! ! <anchor id="gconf-engine-notify-remove">gconf_engine_notify_remove () void gconf_engine_notify_remove (GConfEngine *conf, guint cnxn); - Removes a notification request. - - - - - - conf : - the GConfEngine you were monitoring for changes. - - cnxn : - The ID returned by gconf_engine_notify_add(). ! ! <anchor id="gconf-engine-get">gconf_engine_get () GConfValue* gconf_engine_get (GConfEngine *conf, const gchar *key, GError **err); ! Returns the GConfValue stored at key, or NULL if no value is ! set. You must call gconf_value_free() to free the returned value. If you know ! the expected type of the value, you probably want to use the type-specific ! convenience wrappers (gconf_engine_get_int(), etc.) because they will do the ! type-checking for you and return the appropriate type. Automatically returns the ! default value for a key, if the key is unset and a default exists. ! ! ! ! ! ! conf : ! a GConfEngine to get the value from. ! ! key : ! the key to get. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :newly-allocated GConfValue, or NULL if unset and no default exists. ! ! <anchor id="gconf-engine-get-with-locale">gconf_engine_get_with_locale () GConfValue* gconf_engine_get_with_locale (GConfEngine *conf, --- 263,328 ---- gpointer user_data, GError **err); ! ! ! conf : ! ! ! namespace_section : ! ! ! func : ! ! ! user_data : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-notify-remove">gconf_engine_notify_remove () void gconf_engine_notify_remove (GConfEngine *conf, guint cnxn); + + conf : + + + cnxn : + ! ! ! <anchor id="gconf-engine-get">gconf_engine_get () GConfValue* gconf_engine_get (GConfEngine *conf, const gchar *key, GError **err); ! ! ! conf : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-with-locale">gconf_engine_get_with_locale () GConfValue* gconf_engine_get_with_locale (GConfEngine *conf, *************** *** 409,443 **** const gchar *locale, GError **err); - Requests the value appropriate for a particular locale. Right now, - only values of type GCONF_VALUE_SCHEMA are localized; the locale is - meaningless for other value types. Also, gconf_engine_get() automatically - requests the value in the user's current locale. So this function is - only useful if you want a schema for some locale other than the user's - current locale. Except for the additional argument, this function is - identical to gconf_engine_get() in all respects. - - - - - - conf : - a GConfEngine to get the value from. - - key : - the key to get. - - locale : - preferred locale (as in the locale-related environment variables). - - err : - the return location for an allocated GError, or NULL to ignore errors. - - Returns :newly-allocated GConfValue, or NULL if unset. ! ! <anchor id="gconf-engine-get-without-default">gconf_engine_get_without_default () GConfValue* gconf_engine_get_without_default --- 330,354 ---- const gchar *locale, GError **err); + + conf : + + + key : + + + locale : + + + err : + + + Returns : ! ! ! <anchor id="gconf-engine-get-without-default">gconf_engine_get_without_default () GConfValue* gconf_engine_get_without_default *************** *** 445,472 **** const gchar *key, GError **err); ! Identical to gconf_engine_get(), except that it will return NULL in ! place of the default value if the key is unset. Note that gconf_engine_get() can also ! return NULL if no default exists or an error occurs. ! ! ! ! ! ! conf : ! a GConfEngine to get the value from. ! ! key : ! the key to get. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :newly-allocated GConfValue, or NULL if unset. ! ! <anchor id="gconf-engine-get-entry">gconf_engine_get_entry () GConfEntry* gconf_engine_get_entry (GConfEngine *conf, --- 356,377 ---- const gchar *key, GError **err); ! ! ! conf : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-entry">gconf_engine_get_entry () GConfEntry* gconf_engine_get_entry (GConfEngine *conf, *************** *** 475,506 **** gboolean use_schema_default, GError **err); - Obtain the full GConfEntry for a value. - - - - - - conf : - - - key : - - - locale : - - - use_schema_default : - - - err : - - - Returns : ! ! <anchor id="gconf-engine-get-default-from-schema">gconf_engine_get_default_from_schema () GConfValue* gconf_engine_get_default_from_schema --- 380,407 ---- gboolean use_schema_default, GError **err); + + conf : + + + key : + + + locale : + + + use_schema_default : + + + err : + + + Returns : ! ! ! <anchor id="gconf-engine-get-default-from-schema">gconf_engine_get_default_from_schema () GConfValue* gconf_engine_get_default_from_schema *************** *** 508,539 **** const gchar *key, GError **err); ! Returns the default value stored in the key's schema, if the key has a schema ! associated and the schema exists and the schema contains a default value. Note ! that gconf_engine_get(), gconf_engine_get_string(), and so on already return the default value ! if no other value is found, so normally you do not need this function. This ! function is just for convenience; you could also get the GConfMetaInfo for the ! key, read the schema name from there, then look up the schema by name and ! extract the default value. ! ! ! ! ! ! conf : ! a GConfEngine to get the value from. ! ! key : ! the key to get the default value for. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :newly-allocated GConfValue, or NULL if unset. ! ! <anchor id="gconf-engine-set">gconf_engine_set () gboolean gconf_engine_set (GConfEngine *conf, --- 409,430 ---- const gchar *key, GError **err); ! ! ! conf : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set">gconf_engine_set () gboolean gconf_engine_set (GConfEngine *conf, *************** *** 541,607 **** const GConfValue *value, GError **err); - Sets the value of key to value. Does not modify the passed-in - GConfValue, you must free it yourself. You may prefer a type-specific - convenience wrapper, such as gconf_engine_set_int(). - ! ! An error of note is GCONF_OVERRIDDEN, indicating that the system ! administrator has "forced" a value for this key. If no writable ! configuration sources exist, it is not an error, but GConf will just ! forget all your values; this allows users to have a configuration-free ! setup without a constant barrage of error messages. ! ! ! ! ! ! conf : ! a GConfEngine to set the value in. ! ! key : ! the key to set. ! ! value : ! the new value of key. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :TRUE on success, FALSE on error. ! ! <anchor id="gconf-engine-unset">gconf_engine_unset () gboolean gconf_engine_unset (GConfEngine *conf, const gchar *key, GError **err); - Unsets the value of key; if key is already unset, has no effect. An - error of note is GCONF_OVERRIDDEN, indicating that the system - administrator has "forced" a value for this key. - - - - - - conf : - a GConfEngine to affect. - - key : - the key to unset. - - err : - the return location for an allocated GError, or NULL to ignore errors. - - Returns :TRUE on success, FALSE on error. ! ! <anchor id="gconf-engine-associate-schema">gconf_engine_associate_schema () gboolean gconf_engine_associate_schema (GConfEngine *conf, --- 432,478 ---- const GConfValue *value, GError **err); ! ! conf : ! ! ! key : ! ! ! value : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-unset">gconf_engine_unset () gboolean gconf_engine_unset (GConfEngine *conf, const gchar *key, GError **err); + + conf : + + + key : + + + err : + + + Returns : ! ! ! <anchor id="gconf-engine-associate-schema">gconf_engine_associate_schema () gboolean gconf_engine_associate_schema (GConfEngine *conf, *************** *** 609,955 **** const gchar *schema_key, GError **err); ! Directs GConf to find the schema for key at location ! schema_key. That is, the value stored at schema_key should have type ! GCONF_VALUE_SCHEMA, and be descriptive of key. Normally you don't ! call this function from C code; you can ship a special file with your ! application and ask gconftool to install ! schema associations into the database during "make install." ! ! ! ! ! ! conf : ! a GConfEngine to affect. ! ! key : ! the key to associate the schema with. ! ! schema_key : ! the key where the schema will be stored. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :TRUE on success, FALSE on error. ! ! <anchor id="gconf-engine-all-entries">gconf_engine_all_entries () GSList* gconf_engine_all_entries (GConfEngine *conf, const gchar *dir, GError **err); - Lists the key-value pairs in dir. Does not list subdirectories; for - that use gconf_engine_all_dirs(). The returned list contains GConfEntry - objects. A GConfEntry contains a relative key - and a value. The list is not recursive, it contains only the immediate - children of dir. To free the returned list, gconf_entry_free() - each list element, then g_slist_free() the list itself. - - - - - - conf : - a GConfEngine. - - dir : - Directory to list. - - err : - the return location for an allocated GError, or NULL to ignore errors. - - Returns :List of GConfEntry. ! ! <anchor id="gconf-engine-all-dirs">gconf_engine_all_dirs () GSList* gconf_engine_all_dirs (GConfEngine *conf, const gchar *dir, GError **err); ! Lists the subdirectories in dir. The returned list contains allocated ! strings; you should g_free() each string in the list, then ! g_slist_free() the list itself. ! ! ! ! ! ! conf : ! a GConfEngine. ! ! dir : ! Directory to get subdirectories from. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :List of allocated subdirectory names. ! ! <anchor id="gconf-engine-suggest-sync">gconf_engine_suggest_sync () void gconf_engine_suggest_sync (GConfEngine *conf, GError **err); - Suggests to gconfd that you've just finished - a block of changes, and it would be an optimal time to sync to - permanent storage. This is only a suggestion; and - gconfd will eventually sync even if you - don't call gconf_engine_suggest_sync(). This function is just a "hint" - provided to gconfd to maximize efficiency - and minimize data loss. - - - - - - conf : - the GConfEngine to suggest syncing to. - - err : - the return location for an allocated GError, or NULL to ignore errors. ! ! <anchor id="gconf-engine-dir-exists">gconf_engine_dir_exists () gboolean gconf_engine_dir_exists (GConfEngine *conf, const gchar *dir, GError **err); ! Queries whether the directory dir exists in the GConf ! database. Returns TRUE or FALSE. ! ! ! ! ! ! conf : ! a GConfEngine. ! ! dir : ! Directory to check for. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :TRUE or FALSE. ! ! <anchor id="gconf-valid-key">gconf_valid_key () gboolean gconf_valid_key (const gchar *key, gchar **why_invalid); - Asks whether a key is syntactically correct, that is, it ensures that - the key consists of slash-separated strings and contains only legal - characters. Normally you shouldn't need to call this function; the - GConf functions all check this for you and return an error if the key - is invalid. However, it may be useful to validate input to an entry - field or the like. If you pass a non-NULL address as - the why_invalid argument, an allocated string is returned explaining - why the key is invalid, if it is. If the key is valid the why_invalid - argument is unused. - - - - - - key : - key to check. - - why_invalid : - return location for an explanation of the problem, if any. g_free() the returned string. - - Returns :TRUE if the key is valid, or FALSE if not. ! ! <anchor id="gconf-key-is-below">gconf_key_is_below () gboolean gconf_key_is_below (const gchar *above, const gchar *below); ! Asks whether the key below would be found below the key above, were ! they both to exist in the database. For example, /foo ! is always found below / and above ! /foo/bar. This probably isn't useful but GConf uses ! it internally so here it is if you need it. ! ! ! ! ! ! above : ! the key on the "left hand side" of the predicate. ! ! below : ! the key on the "right hand side." ! ! Returns :TRUE or FALSE. ! ! <anchor id="gconf-engine-get-float">gconf_engine_get_float () gdouble gconf_engine_get_float (GConfEngine *conf, const gchar *key, GError **err); ! Requests the floating point number (GCONF_VALUE_FLOAT) stored at ! key. Automatically performs type-checking, so if a non-float is ! stored at key, an error is returned. On error, or if key is unset, ! 0.0 is returned. ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! key you want the value of. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :the value of key, or 0.0 if no value is obtained. ! ! <anchor id="gconf-engine-get-int">gconf_engine_get_int () gint gconf_engine_get_int (GConfEngine *conf, const gchar *key, GError **err); - Requests the integer (GCONF_VALUE_INT) stored at - key. Automatically performs type-checking, so if a non-integer is - stored at key, an error is returned. On error, or if key is unset, - 0 is returned. - - - - - - conf : - a GConfEngine. - - key : - key you want the value of. - - err : - the return location for an allocated GError, or NULL to ignore errors. - - Returns :the value of key, or 0 if no value is obtained. ! ! <anchor id="gconf-engine-get-string">gconf_engine_get_string () gchar* gconf_engine_get_string (GConfEngine *conf, const gchar *key, GError **err); ! Requests the string (GCONF_VALUE_STRING) stored at ! key. Automatically performs type-checking, so if a non-string is ! stored at key, an error is returned. On error, or if key is unset, ! NULL is returned. ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! key you want the value of. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :allocated string (value of key), or NULL if no value is obtained. ! ! <anchor id="gconf-engine-get-bool">gconf_engine_get_bool () gboolean gconf_engine_get_bool (GConfEngine *conf, const gchar *key, GError **err); - Requests the boolean value (GCONF_VALUE_BOOL) stored at - key. Automatically performs type-checking, so if a non-bool is - stored at key, an error is returned. On error, or if key is unset, - FALSE is returned. - - - - - - conf : - a GConfEngine. - - key : - key you want the value of. - - err : - the return location for an allocated GError, or NULL to ignore errors. - - Returns :the value of key, or FALSE if no value is obtained. ! ! <anchor id="gconf-engine-get-schema">gconf_engine_get_schema () GConfSchema* gconf_engine_get_schema (GConfEngine *conf, const gchar *key, GError **err); ! Requests the schema (GCONF_VALUE_SCHEMA) stored at key. ! Automatically performs type-checking, so if a non-schema is stored at ! key, an error is returned. If no value is set or an error occurs, ! NULL is returned. ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! key you want the value of. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :the value of key as an allocated GConfSchema, or NULL if no value was obtained. ! ! <anchor id="gconf-engine-get-list">gconf_engine_get_list () GSList* gconf_engine_get_list (GConfEngine *conf, --- 480,732 ---- const gchar *schema_key, GError **err); ! ! ! conf : ! ! ! key : ! ! ! schema_key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-all-entries">gconf_engine_all_entries () GSList* gconf_engine_all_entries (GConfEngine *conf, const gchar *dir, GError **err); + + conf : + + + dir : + + + err : + + + Returns : ! ! ! <anchor id="gconf-engine-all-dirs">gconf_engine_all_dirs () GSList* gconf_engine_all_dirs (GConfEngine *conf, const gchar *dir, GError **err); ! ! ! conf : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-suggest-sync">gconf_engine_suggest_sync () void gconf_engine_suggest_sync (GConfEngine *conf, GError **err); + + conf : + + + err : + ! ! ! <anchor id="gconf-engine-dir-exists">gconf_engine_dir_exists () gboolean gconf_engine_dir_exists (GConfEngine *conf, const gchar *dir, GError **err); ! ! ! conf : ! ! ! dir : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-valid-key">gconf_valid_key () gboolean gconf_valid_key (const gchar *key, gchar **why_invalid); + + key : + + + why_invalid : + + + Returns : ! ! ! <anchor id="gconf-key-is-below">gconf_key_is_below () gboolean gconf_key_is_below (const gchar *above, const gchar *below); ! ! ! above : ! ! ! below : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-float">gconf_engine_get_float () gdouble gconf_engine_get_float (GConfEngine *conf, const gchar *key, GError **err); ! ! ! conf : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-int">gconf_engine_get_int () gint gconf_engine_get_int (GConfEngine *conf, const gchar *key, GError **err); + + conf : + + + key : + + + err : + + + Returns : ! ! ! <anchor id="gconf-engine-get-string">gconf_engine_get_string () gchar* gconf_engine_get_string (GConfEngine *conf, const gchar *key, GError **err); ! ! ! conf : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-bool">gconf_engine_get_bool () gboolean gconf_engine_get_bool (GConfEngine *conf, const gchar *key, GError **err); + + conf : + + + key : + + + err : + + + Returns : ! ! ! <anchor id="gconf-engine-get-schema">gconf_engine_get_schema () GConfSchema* gconf_engine_get_schema (GConfEngine *conf, const gchar *key, GError **err); ! ! ! conf : ! ! ! key : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-list">gconf_engine_get_list () GSList* gconf_engine_get_list (GConfEngine *conf, *************** *** 957,1042 **** GConfValueType list_type, GError **err); - Requests the list (GCONF_VALUE_LIST) stored at key. Automatically - performs type-checking, so if a non-list is stored at key, or the - list does not contain elements of type list_type, an error is - returned. If no value is set or an error occurs, NULL - is returned. Note that NULL is also the empty list, - so if you need to distinguish the empty list from an unset value, you - must use gconf_engine_get() to obtain a raw GConfValue. - ! ! Remember that GConf lists can only store primitive types: ! GCONF_VALUE_FLOAT, GCONF_VALUE_INT, GCONF_VALUE_BOOL, ! GCONF_VALUE_STRING, GCONF_VALUE_SCHEMA. Also remember ! that lists must be uniform, you may not mix types in the same list. ! ! ! ! The type of the list elements depends on list_type. A GConfValue ! with type GCONF_VALUE_LIST normally stores a list of more GConfValue ! objects. gconf_engine_get_list() automatically converts to primitive C ! types. Thus, the list->data fields in the returned list ! contain: ! ! ! ! ! ! ! GCONF_VALUE_INT ! The integer itself, converted with GINT_TO_POINTER() ! ! ! ! GCONF_VALUE_BOOL ! The bool itself, converted with GINT_TO_POINTER() ! ! ! ! GCONF_VALUE_FLOAT ! A pointer to gdouble, which should be freed with g_free() ! ! ! ! GCONF_VALUE_STRING ! A pointer to gchar, which should be freed with g_free() ! ! ! ! GCONF_VALUE_SCHEMA ! A pointer to GConfSchema, which should be freed with gconf_schema_free() ! ! ! ! ! In the GCONF_VALUE_FLOAT and GCONF_VALUE_STRING cases, you must ! g_free() each list element. In the GCONF_VALUE_SCHEMA case you must ! gconf_schema_free() each element. In all cases you must free the ! list itself with g_slist_free(). ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! key you want the value of. ! ! list_type : ! type of each list element. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :an allocated list, with elements as described above. ! ! <anchor id="gconf-engine-get-pair">gconf_engine_get_pair () gboolean gconf_engine_get_pair (GConfEngine *conf, --- 734,758 ---- GConfValueType list_type, GError **err); ! ! conf : ! ! ! key : ! ! ! list_type : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-get-pair">gconf_engine_get_pair () gboolean gconf_engine_get_pair (GConfEngine *conf, *************** *** 1047,1171 **** gpointer cdr_retloc, GError **err); - Requests the pair (GCONF_VALUE_PAIR) stored at key. Automatically - performs type-checking, so if a non-pair is stored at key, or the - pair does not have the right car_type and cdr_type, an error is - returned. Remember that the car of a pair is - its first value, and the cdr is its second - value, in the Lisp tradition. - ! ! Remember that GConf pairs can only store primitive types: ! GCONF_VALUE_FLOAT, GCONF_VALUE_INT, GCONF_VALUE_BOOL, ! GCONF_VALUE_STRING, GCONF_VALUE_SCHEMA. ! - - gconf_engine_get_pair() stores the two fields of the pair in the locations - pointed to by car_retloc and cdr_retloc. The type of these pointers - depends on the corresponding car_type and cdr_type: - - - - - - - GCONF_VALUE_INT - pointer to gint - - - - GCONF_VALUE_BOOL - pointer to gboolean - - - - GCONF_VALUE_FLOAT - pointer to gdouble - - - - GCONF_VALUE_STRING - pointer to gchar* - - - - GCONF_VALUE_SCHEMA - pointer to GConfSchema* - - - - - In the GCONF_VALUE_STRING case, you must g_free() the string(s) - stored in the return location(s). In the GCONF_VALUE_SCHEMA case you - must gconf_schema_free() the returned schema. If there's an error - or the value is unset, car_retloc and cdr_retloc are left unchanged. - ! ! gconf_engine_get_pair() returns TRUE on success. ! ! ! ! An example of gconf_engine_get_pair() in action: ! ! gdouble car = 10.0; ! gchar* cdr = NULL; ! GError* error = NULL; ! ! if (!gconf_engine_get_pair(conf, "/foo", ! GCONF_VALUE_FLOAT, ! GCONF_VALUE_STRING, ! &car, &cdr, &error)) ! { ! /* Note: car/cdr should be untouched, because an error occurred */ ! g_assert(error != NULL); ! fprintf(stderr, "Error: s\n", error->message); ! g_error_free(error); ! error = NULL; ! } ! else ! { ! /* Note: car/cdr may be untouched even though there was no error, ! if no value was set for "/foo" ! */ ! printf("Found pair (g,s)\n", car, cdr); ! if (cdr != NULL) ! g_free(cdr); ! } ! ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! key you want the value of. ! ! car_type : ! desired type of the pair's first field (car). ! ! cdr_type : ! desired type of the pair's second field (cdr). ! ! car_retloc : ! address of a return location for the car. ! ! cdr_retloc : ! address of a return location for the cdr. ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns :TRUE on success, FALSE on error. ! ! ! ! <anchor id="gconf-engine-set-float">gconf_engine_set_float () gboolean gconf_engine_set_float (GConfEngine *conf, --- 763,796 ---- gpointer cdr_retloc, GError **err); ! ! conf : ! ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! car_retloc : ! ! ! cdr_retloc : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set-float">gconf_engine_set_float () gboolean gconf_engine_set_float (GConfEngine *conf, *************** *** 1174,1201 **** GError **err); ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-engine-set-int">gconf_engine_set_int () gboolean gconf_engine_set_int (GConfEngine *conf, --- 799,822 ---- GError **err); ! ! conf : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set-int">gconf_engine_set_int () gboolean gconf_engine_set_int (GConfEngine *conf, *************** *** 1204,1231 **** GError **err); ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-engine-set-string">gconf_engine_set_string () gboolean gconf_engine_set_string (GConfEngine *conf, --- 825,848 ---- GError **err); ! ! conf : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set-string">gconf_engine_set_string () gboolean gconf_engine_set_string (GConfEngine *conf, *************** *** 1234,1261 **** GError **err); ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-engine-set-bool">gconf_engine_set_bool () gboolean gconf_engine_set_bool (GConfEngine *conf, --- 851,874 ---- GError **err); ! ! conf : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set-bool">gconf_engine_set_bool () gboolean gconf_engine_set_bool (GConfEngine *conf, *************** *** 1264,1291 **** GError **err); ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-engine-set-schema">gconf_engine_set_schema () gboolean gconf_engine_set_schema (GConfEngine *conf, --- 877,900 ---- GError **err); ! ! conf : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set-schema">gconf_engine_set_schema () gboolean gconf_engine_set_schema (GConfEngine *conf, *************** *** 1294,1321 **** GError **err); ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! ! ! val : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-engine-set-list">gconf_engine_set_list () gboolean gconf_engine_set_list (GConfEngine *conf, --- 903,926 ---- GError **err); ! ! conf : ! ! ! key : ! ! ! val : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set-list">gconf_engine_set_list () gboolean gconf_engine_set_list (GConfEngine *conf, *************** *** 1325,1355 **** GError **err); ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! ! ! list_type : ! ! ! list : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="gconf-engine-set-pair">gconf_engine_set_pair () gboolean gconf_engine_set_pair (GConfEngine *conf, --- 930,956 ---- GError **err); ! ! conf : ! ! ! key : ! ! ! list_type : ! ! ! list : ! ! ! err : ! ! ! Returns : ! ! <anchor id="gconf-engine-set-pair">gconf_engine_set_pair () gboolean gconf_engine_set_pair (GConfEngine *conf, *************** *** 1361,1400 **** GError **err); ! ! ! ! ! ! conf : ! a GConfEngine. ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! err : ! the return location for an allocated GError, or NULL to ignore errors. ! ! Returns : ! ! <anchor id="GConfEnumStringPair">struct GConfEnumStringPair struct GConfEnumStringPair { gint enum_value; const gchar* str; }; --- 962,998 ---- GError **err); ! ! conf : ! ! ! key : ! ! ! car_type : ! ! ! cdr_type : ! ! ! address_of_car : ! ! ! address_of_cdr : ! ! ! err : ! ! ! Returns : ! ! <anchor id="GConfEnumStringPair">struct GConfEnumStringPair struct GConfEnumStringPair { + gint enum_value; const gchar* str; }; *************** *** 1408,1477 **** const gchar *str, gint *enum_value_retloc); - It's best to store enumeration values as strings rather than integers. This is - robust against changes in the enumeration, and also human-readable. - This function makes it more convenient to store enums as strings. - - - - The first argument is a lookup table, typically declared statically as follows: - - static GConfEnumStringPair foo_enum_lookup_table[] = { - { FOO_BLAH, "Blah" }, - { FOO_BAR, "Bar" }, - { 0, NULL } - }; - - Note that the last element of the table is { 0, NULL }. - Typically the strings you use should be semi-human-readable, for GTK+ and GNOME - stripping off the library prefix and converting to StudlyCaps is the recommended - convention. - ! ! The function returns TRUE if a match for the string is found, ! and if a match is found the enum value is placed in enum_value_retloc. ! ! ! ! ! ! lookup_table : ! a lookup table mapping enum values to strings. ! ! str : ! the string to convert to an enum value. ! ! enum_value_retloc : ! the address of an enum variable. ! ! Returns :TRUE if a match was found. ! ! <anchor id="gconf-enum-to-string">gconf_enum_to_string () const gchar* gconf_enum_to_string (GConfEnumStringPair lookup_table[], gint enum_value); ! See gconf_string_to_enum() for background information on this function. ! ! ! ! ! ! lookup_table : ! a lookup table mapping enum values to strings. ! ! enum_value : ! the enumeration value to convert to a string. ! ! Returns :a pointer to the proper string in the lookup table, or NULL if no match was found. ! ! --- 1006,1045 ---- const gchar *str, gint *enum_value_retloc); ! ! lookup_table : ! ! ! str : ! ! ! enum_value_retloc : ! ! ! Returns : ! ! <anchor id="gconf-enum-to-string">gconf_enum_to_string () const gchar* gconf_enum_to_string (GConfEnumStringPair lookup_table[], gint enum_value); ! ! ! lookup_table : ! ! ! enum_value : ! ! ! Returns : ! ! diff -crN ./GConf/doc/gconf/sgml/object_index.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/object_index.sgml *** ./GConf/doc/gconf/sgml/object_index.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/object_index.sgml Sat Aug 9 21:12:03 2003 *************** *** 6,10 **** --- 6,14 ---- GConfClient + GInterface GObject + + + GTypePlugin diff -crN ./GConf/doc/gconf/sgml/tree_index.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/tree_index.sgml *** ./GConf/doc/gconf/sgml/tree_index.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/sgml/tree_index.sgml Sat Aug 9 21:12:03 2003 *************** *** 1,4 **** --- 1,6 ---- GObject GConfClient + GInterface + GTypePlugin diff -crN ./GConf/doc/gconf/tmpl/gconf-changeset.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-changeset.sgml *** ./GConf/doc/gconf/tmpl/gconf-changeset.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-changeset.sgml Sat Aug 9 21:12:02 2003 *************** *** 1,116 **** ! GConfChangeSet - a set of configuration changes to be made. - a #GConfChangeSet allows you to collect a set of changes to - configuration keys (set/unset operations). You can then commit - all the changes at once. This is convenient for something like a - preferences dialog; you can collect all the pending changes in a - #GConfChangeSet, then when the user clicks "apply" send them all to - the configuration database. The #GConfChangeSet allows you to avoid - sending every preferences setting when "apply" is clicked; you only - have to send the settings the user changed. - - - In the future, GConf may also have optimizations so that - changing a group of values with #GConfChangeSet is faster than calling - gconf_engine_set () for each value. In the future, #GConfChangeSet may also - represent an atomic transaction, where all or none of the values are - set; however, for now the operation is not - atomic. ! An opaque data type representing a set of changes to be made. ! A change set can contain "set" and "unset" operations. ! The type of a function passed to gconf_change_set_foreach(). ! The @cs argument is the #GConfChangeSet you're iterating over. @key is ! a key in the change set. @value is the value the key will be set to, ! or NULL if the key will be unset. @user_data is the ! user data passed to gconf_change_set_foreach(). ! @cs: the #GConfChangeSet being iterated over. ! @key: the current key. ! @value: the current value, or NULL. ! @user_data: user data passed to gconf_change_set_foreach(). ! Applies the changes in the change set to the #GConfEngine passed as ! the first argument. If @remove_committed is TRUE, ! then any successfully-committed changes are removed from the change ! set. If @remove_committed is FALSE, the ! #GConfChangeSet is left unmodified. ! ! If any set or unset operation results in an error, then processing ! terminates and the error is returned in @err (unless @err was ! NULL). If @remove_committed was ! TRUE, then all the changes committed before the error ! occurred will have been removed from the set. If any error occurs, ! FALSE is returned. ! ! ! @conf: a #GConfEngine. ! @cs: a #GConfChangeSet. ! @remove_committed: whether to remove successfully-committed changes from the set ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: TRUE on success, FALSE if an error occurs. ! Creates a new, empty #GConfChangeSet. The caller assumes one reference ! count, and must call gconf_change_set_unref() eventually. ! @Returns: a new #GConfChangeSet. ! Increases the reference count of a #GConfChangeSet by one. ! @cs: a #GConfChangeSet. ! Decreases the reference count of a #GConfChangeSet by one. If the ! reference count reaches 0, destroys the #GConfChangeSet. ! @cs: a #GConfChangeSet. ! Clears all changes from a #GConfChangeSet, so that committing the ! change set would have no effect. ! @cs: a #GConfChangeSet. --- 1,80 ---- ! gconf-changeset + + ! ! ! @cs: ! @key: ! @value: ! @user_data: ! ! @conf: ! @cs: ! @remove_committed: ! @err: ! @Returns: ! ! @Returns: ! ! @cs: ! ! @cs: ! ! @cs: *************** *** 124,241 **** ! Removes a change from a #GConfChangeSet. The key given as the @key ! argument will not be modified if this change set is committed. ! If @key is not in the change set, this function has no effect. ! @cs: a #GConfChangeSet. ! @key: key to remove from the change set. ! Iterates over a #GConfChangeSet by calling a ! #GConfChangeSetForeachFunc for each change in the set. See the ! description of #GConfChangeSetForeachFunc for details. You may not ! call gconf_change_set_remove() during the iteration, because you'll ! confuse the internal data structures and cause memory corruption. ! @cs: a #GConfChangeSet. ! @func: function to call for each change in the change set. ! @user_data: user data to pass to the #GConfChangeSetForeachFunc. ! Adds a "set" operation to a change set. This function is similar to ! gconf_engine_set (), except that no errors can occur (errors occur later, when ! you try to commit the change set). ! @cs: a #GConfChangeSet. ! @key: the key to change. ! @value: the value to change the key to. ! Like gconf_change_set_set(), except that the #GConfChangeSet takes ! ownership of the #GConfValue. You should not use the value again. It ! will be destroyed when the change is removed from the #GConfChangeSet, ! the change is modified, or the #GConfChangeSet is destroyed. ! @cs: a #GConfChangeSet. ! @key: the key to change. ! @value: the new value of @key. ! Adds an "unset" operation to a #GConfChangeSet. This function ! schedules a gconf_engine_unset(). ! @cs: a #GConfChangeSet. ! @key: the key to unset. ! Adds a "set" operation; takes a #gdouble argument, so you can avoid ! creating a #GConfValue. ! @cs: a #GConfChangeSet. ! @key: the key to set. ! @val: the new value of @key. ! Adds a "set" operation; takes a #gint argument, so you can avoid ! creating a #GConfValue. ! @cs: a #GConfChangeSet. ! @key: the key to set. ! @val: the new value of @key. ! Adds a "set" operation; takes a #gchar* argument, so you can avoid ! creating a #GConfValue. ! @cs: a #GConfChangeSet. ! @key: the key to set. ! @val: the new value of @key. ! Adds a "set" operation; takes a #gboolean argument, so you can avoid ! creating a #GConfValue. ! @cs: a #GConfChangeSet. ! @key: the key to set. ! @val: the new value of @key. ! Adds a "set" operation; takes a #GConfSchema argument, so you can ! avoid creating a #GConfValue. The schema is copied, @val is left ! unmodified. ! @cs: a #GConfChangeSet. ! @key: the key to set. ! @val: the new value of @key. --- 88,187 ---- ! ! @cs: ! @key: ! ! @cs: ! @func: ! @user_data: ! ! @cs: ! @key: ! @value: ! ! @cs: ! @key: ! @value: ! ! @cs: ! @key: ! ! @cs: ! @key: ! @val: ! ! @cs: ! @key: ! @val: ! ! @cs: ! @key: ! @val: ! ! @cs: ! @key: ! @val: ! ! @cs: ! @key: ! @val: diff -crN ./GConf/doc/gconf/tmpl/gconf-client.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-client.sgml *** ./GConf/doc/gconf/tmpl/gconf-client.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-client.sgml Sat Aug 9 21:12:01 2003 *************** *** 3,172 **** - #GtkObject-based convenience wrapper - #GConfClient adds the following features to plain GConf: - - - - A client-side cache for a specified list of directories you're interested in. - You can "preload" entire directories into the cache, speeding things up even more. - - - - - Some automatic error handling, if you request it. - - - - - Signals when a value changes or an error occurs. - - - - - - - If you use #GConfClient, you should not use the underlying #GConfEngine - directly, or you'll break things. This is why there's no - gconf_client_get_engine() function; in fact, if you create the #GConfClient with - gconf_client_get_default(), there is no (legitimate) way to obtain a pointer to the - underlying #GConfEngine. If you create a #GConfClient from an existing engine, - you'll have to be disciplined enough to avoid using that engine directly. - - - This is all a white lie; some direct #GConfEngine - operations are safe. But it's complicated to know which, and if an operation - isn't safe the resulting bugs will mangle the cache and cause weird bugs at an - indeterminate time in the future; you don't want to risk this - situation. - - - - - - - A #GConfClient has a list of directories that it "watches." These directories - are optionally pre-loaded into the cache, and monitored in order to emit the - #value_changed signal. The #GConfClient can also be used to access directories - not in the list, but those directories won't be preloaded and the "value_changed" - signal won't be emitted for them. - - There are two error-related signals in #GConfClient. The first is plain "error"; - it's emitted anytime an error occurs. The second is "unreturned_error"; this - signal is emitted if you pass NULL as the #GError** to any - #GConfClient function. The idea is that you can have a global error handler - attached to the "unreturned_error" signal; if you want to use this handler, you - don't need to use the normal GConf error handling mechanism. However, if you - ever need to handle errors for a specific function call, you can override the - global handler by passing a non-NULL #GError** to the - function. If you want an error handler that's always - invoked, use the "error" signal. - - - - The "value_changed" signal is emitted whenever the server notifies your client - program that a value has changed in the GConf database. There's one problem with - this signal: the signal handler has to use strcmp() to determine whether the - changed value is the one it was interested in. If you are interested in lots of - values, then every time a value changes you'll be making lots of calls to - strcmp() and getting O(n) performance. gconf_client_notify_add() is a superior - interface in most cases for this reason. Note that calling gconf_client_set() - and its relatives will cause "value_changed" to be emitted, but "value_changed" - is also emitted if another process changes the value. - - - - Most of the #GConfClient interface mirrors the functions you'd use to manipulate - a #GConfEngine (gconf_engine_get () and gconf_client_get(), for example). These should - all work just like the #GConfEngine versions, except that they use the cache - from #GConfClient and emit the #GConfClient signals. - - - - As always with GConf, applications based on #GConfClient should use a - model-controller-view architecture. Typically, this means that areas of your - application affected by a setting will monitor the relevant key and update - themselves when necessary. The preferences dialog will simply change keys, - allowing GConf to notify the rest of the application that changes have occurred. - Here the application proper is the "view," GConf is the "model", and the - preferences dialog is the "controller." In no case should you do this: - - gconf_client_set(client, key, value); - application_update_to_reflect_setting(); - - This breaks if a setting is changed outside your - application—or even from a different part of your application. - The correct way (in pseudo-code) is: - - /* At application startup */ - gconf_client_notify_add(client, key, application_update_to_reflect_setting, data); - - /* From preferences dialog */ - gconf_client_set(client, key, value); - - See the example programs that come with GConf for more details. - ! The #GConfClientPreloadType is used to tell #GConfClient how to preload one of ! its directories. As a rule of thumb, if you plan to get the value of almost all the ! keys in a directory, preloading that directory will probably enhance ! performance. If you plan to use only half the keys, preloading is likely a bad ! idea. @GCONF_CLIENT_PRELOAD_NONE specifies that no preload occurs, ! @GCONF_CLIENT_PRELOAD_ONELEVEL loads the immediate children of the directory, ! @GCONF_CLIENT_PRELOAD_RECURSIVE loads all children of the ! directory and its subdirectories, recursively. ! @GCONF_CLIENT_PRELOAD_NONE: preload nothing. ! @GCONF_CLIENT_PRELOAD_ONELEVEL: preload immediate children of the directory. ! @GCONF_CLIENT_PRELOAD_RECURSIVE: recursively preload everything in and below the directory. ! #GConfClientErrorHandlingMode is used to control #GConfClient's default error ! handling. #GConfClient can pop up a dialog in the default signal handler for ! "error" or "unreturned_error." You can specify that no errors are handled, only ! unreturned errors are handled, or all errors are handled with this enumeration. ! You can prevent specific errors from being handled automatically by stopping the ! signal emission before the default signal handler is called (see the GTK+ ! documentation, gtk_signal_emit_stop_by_name() for example). ! @GCONF_CLIENT_HANDLE_NONE: never run a default error handler. ! @GCONF_CLIENT_HANDLE_UNRETURNED: run a default error handler for unreturned errors ("unreturned_error" signal). ! @GCONF_CLIENT_HANDLE_ALL: run a default error handler for all errors ("error" signal). ! This is the signature of a user function added with gconf_client_notify_add(). ! The notify function is invoked when the value of a key changes. The @value ! argument is the new value, or NULL if the key was unset. The ! @value argument should not be modified, and should be copied if you want to keep ! it around (the #GConfClient will destroy it sometime after your notify function ! is called). ! @client: the #GConfClient notifying us. ! @cnxn_id: connection ID from gconf_client_notify_add(). @entry: ! @user_data: user data from gconf_client_notify_add(). ! ! @key: key that has changed. ! @value: new value, or NULL for unset. ! @is_default: --- 3,48 ---- + ! ! @GCONF_CLIENT_PRELOAD_NONE: ! @GCONF_CLIENT_PRELOAD_ONELEVEL: ! @GCONF_CLIENT_PRELOAD_RECURSIVE: ! ! @GCONF_CLIENT_HANDLE_NONE: ! @GCONF_CLIENT_HANDLE_UNRETURNED: ! @GCONF_CLIENT_HANDLE_ALL: ! ! @client: ! @cnxn_id: @entry: ! @user_data: *************** *** 176,313 **** @client: @error: - - @parent_func: - @parent_user_data: ! Casts a pointer to a #GConfClient*. ! @obj: a #GConfClient. ! Creates a new #GConfClient using the default #GConfEngine. Normally this is the ! engine you want. If someone else is already using the default ! #GConfClient, this function returns the same one they're using, but ! with the reference count incremented. So you have to unref either way. ! @Returns: a new #GConfClient. g_object_unref() when you're done. ! Creates a new #GConfClient with a specific #GConfEngine. Only specialized ! configuration-related programs should need to call this function. The ! returned #GConfClient should be unref'd when you're done with g_object_unref(). ! Remember to avoid using the #GConfEngine directly once you have a #GConfClient ! wrapper. ! @engine: the #GConfEngine to use. ! @Returns: a new #GConfClient. - Add a directory to the list of directories the #GConfClient will watch. Any - changes to keys below this directory will cause the "value_changed" signal to be - emitted. When you add the directory, you can request that the #GConfClient - preload its contents; see #GConfClientPreloadType for details. - - - Added directories may not overlap. That is, if you add "/foo", you may not add - "/foo/bar". However you can add "/foo" and "/bar". You can also add "/foo" - multiple times; if you add a directory multiple times, it will not be removed - until you call gconf_client_remove_dir() an equal number of times. ! @client: a #GConfClient. ! @dir: directory to add to the list. ! @preload: degree of preload. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! Remove a directory from the list created with gconf_client_add_dir(). If any ! notifications have been added below this directory with ! gconf_client_notify_add(), those notifications will be disabled until you re-add ! the removed directory. Note that if a directory has been added multiple times, ! you must remove it the same number of times before the remove takes effect. ! @client: a #GConfClient. ! @dir: directory to remove. @err: - Request notification of changes to @namespace_section. This includes the key - @namespace_section itself, and any keys below it (the behavior is identical to - gconf_engine_notify_add(), but while gconf_engine_notify_add() places a notification request - on the server for every notify function, #GConfClient requests server - notification for directories added with gconf_client_add_dir() and keeps the - list of #GConfClientNotifyFunc on the client side). - - - - For the notification to happen, @namespace_section must be equal to or below one - of the directories added with gconf_client_add_dir(). You can still call - gconf_client_notify_add() for other directories, but no notification will be - received until you add a directory above or equal to @namespace_section. One - implication of this is that gconf_client_remove_dir() temporarily disables - notifications that were below the removed directory. - - - The function returns a connection ID you can use to call - gconf_client_notify_remove(). ! ! See the description of #GConfClientNotifyFunc for details on how the ! notification function is called. ! ! ! @client: a #GConfClient. ! @namespace_section: where to listen for changes. ! @func: function to call when changes occur. ! @user_data: user data to pass to @func. ! @destroy_notify: function to call on @user_data when the notify is removed or the #GConfClient is destroyed, or NULL for none. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: a connection ID for removing the notification. ! Remove a notification using the ID returned from ! gconf_client_notify_add(). Invokes the destroy notify function on the ! notification's user data, if appropriate. ! @client: a #GConfClient. ! @cnxn: connection ID. ! Controls the default error handling for #GConfClient. See ! #GConfClientErrorHandlingMode and #GConfClientParentWindowFunc for details on this. ! @client: a #GConfClient. ! @mode: error handling mode. ! ! @func: function to retrieve the parent window for error dialogs. ! @user_data: user data to pass to @func. --- 52,135 ---- @client: @error: ! ! @obj: ! ! @Returns: ! ! @engine: ! @Returns: ! @client: ! @dir: ! @preload: ! @err: ! ! @client: ! @dir: @err: ! @client: ! @namespace_section: ! @func: ! @user_data: ! @destroy_notify: ! @err: ! @Returns: ! ! @client: ! @cnxn: ! ! @client: ! @mode: *************** *** 320,357 **** ! Dumps everything out of the #GConfClient client-side cache. If you know you're ! done using the #GConfClient for a while, you can call this function to save some ! memory. ! @client: a #GConfClient. ! Preloads a directory. Normally you do this when you call gconf_client_add_dir(), ! but if you've called gconf_client_clear_cache() there may be a reason to do it ! again. ! @client: a #GConfClient. ! @dirname: directory to preload. ! @type: degree of preload. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! Sets the value of a configuration key. Just like gconf_engine_set (), but uses ! #GConfClient caching and error-handling features. The @val argument will not be ! modified. ! @client: a #GConfClient. ! @key: key to set. ! @val: new value. ! @err: the return location for an allocated #GError, or NULL to ignore errors. --- 142,173 ---- ! ! @client: ! ! @client: ! @dirname: ! @type: ! @err: ! ! @client: ! @key: ! @val: ! @err: *************** *** 405,413 **** ! @client: a #GConfClient. @key: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 221,229 ---- ! @client: @key: ! @err: @Returns: *************** *** 416,424 **** ! @client: a #GConfClient. @dir: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 232,240 ---- ! @client: @dir: ! @err: @Returns: *************** *** 427,435 **** ! @client: a #GConfClient. @dir: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 243,251 ---- ! @client: @dir: ! @err: @Returns: *************** *** 438,445 **** ! @client: a #GConfClient. ! @err: the return location for an allocated #GError, or NULL to ignore errors. --- 254,261 ---- ! @client: ! @err: *************** *** 447,455 **** ! @client: a #GConfClient. @dir: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 263,271 ---- ! @client: @dir: ! @err: @Returns: *************** *** 458,466 **** ! @client: a #GConfClient. @key: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 274,282 ---- ! @client: @key: ! @err: @Returns: *************** *** 469,477 **** ! @client: a #GConfClient. @key: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 285,293 ---- ! @client: @key: ! @err: @Returns: *************** *** 480,488 **** ! @client: a #GConfClient. @key: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 296,304 ---- ! @client: @key: ! @err: @Returns: *************** *** 491,499 **** ! @client: a #GConfClient. @key: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 307,315 ---- ! @client: @key: ! @err: @Returns: *************** *** 502,510 **** ! @client: a #GConfClient. @key: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 318,326 ---- ! @client: @key: ! @err: @Returns: *************** *** 513,522 **** ! @client: a #GConfClient. @key: @list_type: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 329,338 ---- ! @client: @key: @list_type: ! @err: @Returns: *************** *** 525,537 **** ! @client: a #GConfClient. @key: @car_type: @cdr_type: @car_retloc: @cdr_retloc: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 341,353 ---- ! @client: @key: @car_type: @cdr_type: @car_retloc: @cdr_retloc: ! @err: @Returns: *************** *** 540,549 **** ! @client: a #GConfClient. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 356,365 ---- ! @client: @key: @val: ! @err: @Returns: *************** *** 552,561 **** ! @client: a #GConfClient. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 368,377 ---- ! @client: @key: @val: ! @err: @Returns: *************** *** 564,573 **** ! @client: a #GConfClient. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 380,389 ---- ! @client: @key: @val: ! @err: @Returns: *************** *** 576,585 **** ! @client: a #GConfClient. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 392,401 ---- ! @client: @key: @val: ! @err: @Returns: *************** *** 588,597 **** ! @client: a #GConfClient. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 404,413 ---- ! @client: @key: @val: ! @err: @Returns: *************** *** 600,610 **** ! @client: a #GConfClient. @key: @list_type: @list: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 416,426 ---- ! @client: @key: @list_type: @list: ! @err: @Returns: *************** *** 613,692 **** ! @client: a #GConfClient. @key: @car_type: @cdr_type: @address_of_car: @address_of_cdr: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: ! Emits the "error" signal. Rarely useful. ! @client: a #GConfClient. ! @error: error to pass to signal handlers. ! Emits the "unreturned_error" signal. Rarely useful. ! @client: a #GConfClient. ! @error: error to pass to signal handlers. ! Emits the "value_changed" signal. Rarely useful. ! @client: a #GConfClient. ! @key: key to pass to signal handlers. ! @value: value of @key to pass to signal handlers. ! Creates a change set that would reverse @cs. That is, for each change in @cs, ! save the current state of that key in the returned change set. ! @client: a #GConfClient. ! @cs: change set to create the reverse of. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: a new change set that would restore the current state of each key in @cs. ! Creates a change set that will change the keys in ! NULL-terminated array @keys to their current state. Use this to ! save the current state of a collection of keys; then you can later revert to the ! current state by committing the returned change set. ! @client: a #GConfClient. ! @keys: NULL-terminated array of key names. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: new change set that changes all the @keys to their current state. ! Convenient varargs version of gconf_client_change_set_from_currentv(). ! @client: a #GConfClient. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @first_key: first key to save the current state of. ! @Varargs: NULL-terminated list of additional keys. ! @Returns: new change set that changes all the keys to their current state. --- 429,504 ---- ! @client: @key: @car_type: @cdr_type: @address_of_car: @address_of_cdr: ! @err: @Returns: ! ! @client: ! @error: ! ! @client: ! @error: ! ! @client: ! @key: ! @value: ! ! @client: ! @cs: ! @err: ! @Returns: ! ! @client: ! @keys: ! @err: ! @Returns: ! ! @client: ! @err: ! @first_key: ! @Varargs: ! @Returns: *************** *** 703,737 **** ! Emitted whenever an error occurs inside a #GConfClient function. Depending on ! the #GConfClientErrorHandlingMode, the default handler for this signal may or ! may not display an error dialog. @gconfclient: the object which received the signal. ! @arg1: a #GError* (the error). ! Emitted when you pass NULL for the #GError** argument to ! any #GConfClient function, and an error occurs. Depending on the ! #GConfClientErrorHandlingMode, the default handler for this signal may or may ! not display an error dialog. @gconfclient: the object which received the signal. ! @arg1: a #GError* (the unhandled error). ! Emitted when a key below one of the directories added with ! gconf_client_add_dir() receives a new value or is unset. Because your signal ! handler will have to use strcmp() to decide whether it cares about the ! particular value that changed, it can be much more efficient to use ! gconf_client_notify_add(). @gconfclient: the object which received the signal. ! @arg1: a const #gchar* representing the changed key name ! @arg2: a #GConfValue* representing the new value, or NULL for unset. --- 515,540 ---- ! @gconfclient: the object which received the signal. ! @arg1: ! @gconfclient: the object which received the signal. ! @arg1: ! @gconfclient: the object which received the signal. ! @arg1: ! @arg2: diff -crN ./GConf/doc/gconf/tmpl/gconf-engine.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-engine.sgml *** ./GConf/doc/gconf/tmpl/gconf-engine.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-engine.sgml Sat Aug 9 21:12:01 2003 *************** *** 1,90 **** ! GConfEngine - a GConf "database" - A #GConfEngine represents a connection to the GConf database. The - default #GConfEngine, returned from gconf_engine_get_default(), represents the - user's normal configuration source search path. Configuration-related - utilities, such as a configuration editor tool, might wish to access a - particular configuration source directly; they can obtain a - non-default #GConfEngine with gconf_engine_get_for_address(). - - - Once you have a #GConfEngine, you can query and manipulate - configuration values. ! An opaque data type representing one or more configuration sources. ! Returns the default #GConfEngine. All clients should use this, unless ! they are special configuration-related tools. The caller of this ! function assumes one reference count, and must call ! gconf_engine_unref() at some point. It's fairly important to unref the ! #GConfEngine, to cleanly close the connection to ! gconfd. So if possible close the connection ! before exiting your application. ! @Returns: the default #GConfEngine. ! Obtains a special #GConfEngine; mostly useful for specialized ! GConf-related tools. Normal clients shouldn't need to use it. ! As with gconf_engine_get_default(), the returned #GConfEngine should be ! unreferenced by the caller of this function. ! @address: a configuration source address. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: a #GConfEngine. ! Obtain a local (non-process-transparent) #GConfEngine. Local engines ! do not support notification, and can only access config databases ! directly (they do not use the multiple sources in a path system ! supported by nonlocal engines). ! @address: address of local database ! @err: return location of an allocated #GError ! @Returns: a #GConfEngine ! Decreases the reference count of a #GConfEngine by one; if the ! reference count reaches 0, destroys the #GConfEngine. ! @conf: a #GConfEngine. ! Increases the reference count of a #GConfEngine by one. ! @conf: a #GConfEngine. --- 1,68 ---- ! gconf-engine + + ! ! ! @Returns: ! ! @address: ! @err: ! @Returns: ! ! @address: ! @err: ! @Returns: ! ! @conf: ! ! @conf: diff -crN ./GConf/doc/gconf/tmpl/gconf-error.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-error.sgml *** ./GConf/doc/gconf/tmpl/gconf-error.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-error.sgml Sat Aug 9 21:12:02 2003 *************** *** 1,99 **** ! GError - error reporting. - The #GError object is used to report errors that occur in GConf - library routines. All functions that report errors work the same way: - - - - The last argument to the function is a #GError**, a pointer to a - location where a #GError* can be placed. - - - - - This last argument may be NULL, in which case no - error will be returned. - - - - - If non-NULL, the argument should be the address of a - #GError* variable, which should be initialized to - NULL. - - - - - If an error occurs, a #GError will be allocated and placed in the - return location; the caller must free the #GError with - g_error_free(). If no error occurs, the return location will be - left untouched. That is, the test error != NULL - should always be a reliable indicator of whether the operation failed. - - - - - - It's also common that the return value of a function indicates whether - or not an error occurred. Typically, TRUE is returned - on success. In some cases, a NULL return value - indicates failure. Either way, if the return value indicates failure - and you passed a non-NULL value for the last argument - to the function, a #GError will be returned. If the return value - indicates success, then a #GError will never be returned. These - relationships are guaranteed; that is, you can reliably use the return - value to decide whether a #GError was placed in the return - location. If a function does not indicate - success/failure by return value, you must check whether the - #GError is NULL to detect errors. - - Here's a short error handling example: - - GError* err = NULL; - - if (!gconf_init(&err)) - { - fprintf(stderr, _("Failed to init GConf: %s\n"), err->message); - g_error_free(err); - err = NULL; - } - - ! The #GConfError enumeration allows client applications to ! differentiate between different kinds of error. You may wish to take ! specific actions depending on the error type. ! ! ! @GCONF_ERROR_SUCCESS: indicates that no error occurred, won't be returned in a #GError. ! @GCONF_ERROR_FAILED: indicates failure, but no more specific #GConfError applied. ! @GCONF_ERROR_NO_SERVER: indicates that the GConf server couldn't be contacted, probably a CORBA problem. ! @GCONF_ERROR_NO_PERMISSION: indicates that permission to access some resource was denied. ! @GCONF_ERROR_BAD_ADDRESS: indicates that a configuration source address was syntactically invalid or impossible to resolve. ! @GCONF_ERROR_BAD_KEY: indicates that a key was malformed. ! @GCONF_ERROR_PARSE_ERROR: indicates that some parsing was done (perhaps in a backend) and it failed. ! @GCONF_ERROR_CORRUPT: indicates that some part of the database is corrupt. ! @GCONF_ERROR_TYPE_MISMATCH: indicates that a specific type was required, and another type was found. ! @GCONF_ERROR_IS_DIR: indicates that an operation only applicable to keys was performed on a directory. ! @GCONF_ERROR_IS_KEY: indicates that an operation only applicable to directories was performed on a key. ! @GCONF_ERROR_OVERRIDDEN: indicates that the administrator has imposed a mandatory value, and it could not be changed. @GCONF_ERROR_OAF_ERROR: @GCONF_ERROR_LOCAL_ENGINE: @GCONF_ERROR_LOCK_FAILED: --- 1,38 ---- ! gconf-error + ! ! ! ! @GCONF_ERROR_SUCCESS: ! @GCONF_ERROR_FAILED: ! @GCONF_ERROR_NO_SERVER: ! @GCONF_ERROR_NO_PERMISSION: ! @GCONF_ERROR_BAD_ADDRESS: ! @GCONF_ERROR_BAD_KEY: ! @GCONF_ERROR_PARSE_ERROR: ! @GCONF_ERROR_CORRUPT: ! @GCONF_ERROR_TYPE_MISMATCH: ! @GCONF_ERROR_IS_DIR: ! @GCONF_ERROR_IS_KEY: ! @GCONF_ERROR_OVERRIDDEN: @GCONF_ERROR_OAF_ERROR: @GCONF_ERROR_LOCAL_ENGINE: @GCONF_ERROR_LOCK_FAILED: *************** *** 102,122 **** ! Creates a new error. Normally the GConf library does this, but you ! might find a reason to do it as well. @en is the error number, @format ! is a printf()-style format for the error message, and the variable ! argument list is the same as in printf(). ! @en: the error number. ! @format: printf()-style format for error description. ! @Varargs: arguments required by the @format. ! @Returns: newly-allocated #GError. ! Internal function. @err: --- 41,58 ---- ! ! @en: ! @format: ! @Varargs: ! @Returns: ! @err: *************** *** 127,133 **** ! Internal function. @err1: --- 63,69 ---- ! @err1: diff -crN ./GConf/doc/gconf/tmpl/gconf-internals.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-internals.sgml *** ./GConf/doc/gconf/tmpl/gconf-internals.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-internals.sgml Sat Aug 9 21:12:02 2003 *************** *** 9,19 **** --- 9,21 ---- + + *************** *** 185,192 **** ! Tries to parse a string and create a primitive #GConfValue from ! it. Only works on primitive types. @type: --- 187,193 ---- ! @type: *************** *** 197,203 **** ! This function does not work. Don't use it. @list_type: --- 198,204 ---- ! @list_type: *************** *** 208,214 **** ! This function does not work. Don't use it. @car_type: --- 209,215 ---- ! @car_type: *************** *** 344,350 **** ! This function is basically for internal use. @conf: --- 345,351 ---- ! @conf: *************** *** 355,361 **** @is_writable_p: @err: @Returns: - - @value_is_default: --- 356,360 ---- diff -crN ./GConf/doc/gconf/tmpl/gconf-listeners.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-listeners.sgml *** ./GConf/doc/gconf/tmpl/gconf-listeners.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-listeners.sgml Sat Aug 9 21:12:02 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./GConf/doc/gconf/tmpl/gconf-locale.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-locale.sgml *** ./GConf/doc/gconf/tmpl/gconf-locale.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-locale.sgml Sat Aug 9 21:12:02 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./GConf/doc/gconf/tmpl/gconf-schema.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-schema.sgml *** ./GConf/doc/gconf/tmpl/gconf-schema.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-schema.sgml Sat Aug 9 21:12:02 2003 *************** *** 9,19 **** --- 9,21 ---- + + *************** *** 115,122 **** @schema: @Returns: - - @x: --- 117,122 ---- *************** *** 126,133 **** @schema: @Returns: - - @x: --- 126,131 ---- *************** *** 137,144 **** @schema: @Returns: - - @x: --- 135,140 ---- *************** *** 148,155 **** @schema: @Returns: - - @x: --- 144,149 ---- *************** *** 159,166 **** @schema: @Returns: - - @x: --- 153,158 ---- *************** *** 170,177 **** @schema: @Returns: - - @x: --- 162,167 ---- *************** *** 181,188 **** @schema: @Returns: - - @x: --- 171,176 ---- *************** *** 192,199 **** @schema: @Returns: - - @x: --- 180,185 ---- *************** *** 203,210 **** @schema: @Returns: - - @x: --- 189,194 ---- diff -crN ./GConf/doc/gconf/tmpl/gconf-sources.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-sources.sgml *** ./GConf/doc/gconf/tmpl/gconf-sources.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-sources.sgml Sat Aug 9 21:12:02 2003 *************** *** 9,19 **** --- 9,21 ---- + + diff -crN ./GConf/doc/gconf/tmpl/gconf-value.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-value.sgml *** ./GConf/doc/gconf/tmpl/gconf-value.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf-value.sgml Sat Aug 9 21:12:02 2003 *************** *** 1,72 **** ! GConfValue, GConfEntry, GConfMetaInfo - A #GConfValue stores a dynamically-typed value. A #GConfEntry stores a - key-value pair. A #GConfMetaInfo stores metainformation about a key. - #GConfValue stores one of the value types GConf understands; GConf - uses #GConfValue to pass values around because it doesn't know the - type of its values at compile time. - - - A #GConfEntry pairs a relative key - name with a value, for example if the value "10" is stored at the key - "/foo/bar/baz", the #GConfEntry will store "baz" and "10". - - A #GConfMetaInfo object holds metainformation about a key, such as - its last modification time and the name of the schema associated with - it. You should rarely if ever need to use #GConfMetaInfo. - (In fact you can't get the metainfo for a key using the current API.) - ! Used to indicate the type of a #GConfValue. ! @GCONF_VALUE_INVALID: Never the type of a #GConfValue obtained from GConf functions; used to indicate errors and the like. ! @GCONF_VALUE_STRING: String value (#gchar*). ! @GCONF_VALUE_INT: Integer value (#gint). ! @GCONF_VALUE_FLOAT: Floating point value (#gdouble). ! @GCONF_VALUE_BOOL: Boolean value (#gboolean). ! @GCONF_VALUE_SCHEMA: Schema value (#GConfSchema). ! @GCONF_VALUE_LIST: List of #GConfValue; #GConfValue elements must have ! a primitive type (i.e. they may not be lists or pairs), and all elements ! of a list must have the same type. ! @GCONF_VALUE_PAIR: Pair of #GConfValue; the first field (car) and the second ! field (cdr) may have different types. The two elements of a pair must be primitive ! types, not lists or pairs. - Represents a dynamically-typed value. The @type field tells you the - type of the value; the other fields should be accessed with the - accessor functions and macros. - - - A #GConfValue should always - be initialized before use. That is, you should not use a #GConfValue - unless you have called one of the functions beginning with - "gconf_value_set_".. For lists, initialization has two - steps: first you must set the list element type, then you must set the - list value. ! @type: The #GConfValueType of this #GConfValue. The only field of ! #GConfValue you should access directly. --- 1,41 ---- ! gconf-value + ! ! @GCONF_VALUE_INVALID: ! @GCONF_VALUE_STRING: ! @GCONF_VALUE_INT: ! @GCONF_VALUE_FLOAT: ! @GCONF_VALUE_BOOL: ! @GCONF_VALUE_SCHEMA: ! @GCONF_VALUE_LIST: ! @GCONF_VALUE_PAIR: ! @type: *************** *** 78,411 **** ! Creates a new #GConfValue with type @type. The type is immutable after ! creation; values have a fixed type. You must ! initialize the #GConfValue after creation; that is, you must set its ! value with one of the "setter" functions. ! @type: type of the new #GConfValue. ! @Returns: newly-allocated #GConfValue. ! Copies a #GConfValue. The copy is a deep copy, that is, any allocated ! memory inside the #GConfValue will also be copied. ! @src: a #GConfValue to copy. ! @Returns: a newly-allocated #GConfValue identical to @src. ! Deallocates a #GConfValue. Also deallocates any allocated memory ! inside the #GConfValue (such as lists, pair members, strings, and schemas). ! @value: a #GConfValue to destroy. - Returns a const gchar* for a #GConfValue with type - %GCONF_VALUE_STRING. The returned string is not a - copy, don't try to free it. It is "owned" by the #GConfValue and will - be destroyed when the #GConfValue is destroyed. - - - If the #GConfValue is not initialized (i.e. no one has called - gconf_value_set_string()) then the string may be - NULL, but of course you should not try to use an - uninitialized #GConfValue. @value: @Returns: - - @x: a #GConfValue. ! Returns a #gint for a #GConfValue with type %GCONF_VALUE_INT. @value: @Returns: - - @x: a #GConfValue. ! Returns a #gdouble for a #GConfValue with type %GCONF_VALUE_DOUBLE. @value: @Returns: - - @x: a #GConfValue. ! Returns the type of the list elements in a #GConfValue with type ! %GCONF_VALUE_LIST. @value: @Returns: - - @x: a #GConfValue. ! Returns a #GSList containing #GConfValue objects. Each #GConfValue in ! the returned list will have the type returned by ! gconf_value_get_list_type(). Remember that the empty #GSList is equal to ! NULL. The list is not a copy; it is "owned" by the ! #GConfValue and will be destroyed when the #GConfValue is destroyed. @value: @Returns: - - @x: a #GConfValue. - Returns the first member (car) of a #GConfValue with type - %GCONF_VALUE_PAIR. The car is another #GConfValue, with a primitive - type (bool, int, float, string, schema). - - - The returned value is not a copy; it is "owned" by the pair and will - be destroyed when the pair is destroyed. @value: @Returns: - - @x: a #GConfValue. - Returns the second member (cdr) of a #GConfValue with type - %GCONF_VALUE_PAIR. The cdr is another #GConfValue, with a primitive - type (bool, int, float, string, schema). - - - The returned value is not a copy; it is "owned" by the pair and will - be destroyed when the pair is destroyed. @value: @Returns: - - @x: a #GConfValue. ! Returns a #gboolean for a #GConfValue with type %GCONF_VALUE_BOOL. @value: @Returns: - - @x: a #GConfValue. - Returns a #GConfSchema for a #GConfValue with type - %GCONF_VALUE_SCHEMA. If the #GConfValue is uninitialized, it - may return NULL; but of course you should have - initialized the #GConfValue. The GConf library will not return values - with a NULL schema. - - - The returned value is not a copy; it is "owned" by the #GConfValue and will - be destroyed when the #GConfValue is destroyed. @value: @Returns: - - @x: a #GConfValue. ! Sets the value of a #GConfValue with type %GCONF_VALUE_INT. ! @value: a #GConfValue of type %GCONF_VALUE_INT. ! @the_int: the integer. ! Sets the value of a #GConfValue with type ! %GCONF_VALUE_STRING. @the_str is copied. ! @value: a #GConfValue of type %GCONF_VALUE_STRING. ! @the_str: the string. ! Sets the value of a #GConfValue with type ! %GCONF_VALUE_FLOAT. ! @value: a #GConfValue of type %GCONF_VALUE_FLOAT. ! @the_float: the floating point number. ! Sets the value of a #GConfValue with type ! %GCONF_VALUE_BOOL. ! @value: a #GConfValue of type %GCONF_VALUE_BOOL. ! @the_bool: a boolean value (TRUE or FALSE). ! Sets the value of a #GConfValue with type %GCONF_VALUE_SCHEMA. The ! #GConfSchema is copied. Alternatively you can use ! gconf_value_set_schema_nocopy(). ! @value: a #GConfValue with type %GCONF_VALUE_SCHEMA. ! @sc: the #GConfSchema. ! Sets the value of a #GConfValue with type ! %GCONF_VALUE_SCHEMA. The #GConfSchema is not ! copied; the #GConfValue takes ownership of it, and it should only be ! accessed via the gconf_value_get_schema() macro. This function is provided ! as a more efficient version of gconf_value_set_schema(). ! @value: a #GConfValue with type %GCONF_VALUE_SCHEMA. ! @sc: the #GConfSchema. ! Sets the value of the first field (car) of a #GConfValue with type ! %GCONF_VALUE_PAIR. The #GConfValue is copied. Alternatively, use ! gconf_value_set_car_nocopy(). ! @value: a #GConfValue with type %GCONF_VALUE_PAIR. ! @car: the #GConfValue to set as the car of the pair. ! Sets the value of the first field (car) of a #GConfValue with type ! %GCONF_VALUE_PAIR. The #GConfValue is not copied; ! the #GConfValue takes ownership of it. Alternatively, use ! gconf_value_set_car(). ! @value: a #GConfValue with type %GCONF_VALUE_PAIR. ! @car: the #GConfValue to set as the car of the pair. ! Sets the value of the second field (cdr) of a #GConfValue with type ! %GCONF_VALUE_PAIR. The #GConfValue is copied. Alternatively, use ! gconf_value_set_cdr_nocopy(). ! @value: a #GConfValue with type %GCONF_VALUE_PAIR. ! @cdr: the #GConfValue to set as the cdr of the pair. ! Sets the value of the second field (cdr) of a #GConfValue with type ! %GCONF_VALUE_PAIR. The #GConfValue is not copied; ! the #GConfValue takes ownership of it. Alternatively, use ! gconf_value_set_cdr(). ! @value: a #GConfValue with type %GCONF_VALUE_PAIR. ! @cdr: the #GConfValue to set as the cdr of the pair. ! Sets the type of the elements in a #GConfValue of type ! %GCONF_VALUE_LIST. All the elements in the list must have the same ! type. You must set the list type before you can set the list value. ! @value: a #GConfValue with type %GCONF_VALUE_LIST. ! @type: the type of elements in this list. ! Sets the value of a #GConfValue with type %GCONF_VALUE_LIST. The ! @list argument should be a #GSList of #GConfValue. Each #GConfValue in ! the list must have the same type, and this type must be specified in ! advance with gconf_value_set_list_type(). This function does ! not copy the list; the #GConfValue will take ! ownership of the list and its contents, and they will be destroyed ! when the #GConfValue is destroyed. Alternatively, use ! gconf_value_set_list() to make a copy. ! @value: a #GConfValue with type %GCONF_VALUE_LIST. ! @list: the #GSList of #GConfValue to set as the list value. ! Sets the value of a #GConfValue with type %GCONF_VALUE_LIST. The ! @list argument should be a #GSList of #GConfValue. Each #GConfValue in ! the list must have the same type, and this type must be specified in ! advance with gconf_value_set_list_type(). This function copies the ! list; it will not modify the @list argument. ! @value: a #GConfValue with type %GCONF_VALUE_LIST. ! @list: the #GSList of #GConfValue to set as the list value. ! Creates a human-readable string representation of a #GConfValue. This ! is intended for debugging and the like; the string representation is ! not suitable for reliable machine parsing (that is, you shouldn't use ! this function to save a value to a file or anything like that). The ! exact nature of the string representation may change in future ! versions. The returned string is newly-allocated and must be freed ! with g_free(). ! @value: a #GConfValue. ! @Returns: a newly-allocated string representing the #GConfValue. --- 47,281 ---- ! ! @type: ! @Returns: ! ! @src: ! @Returns: ! ! @value: @value: @Returns: ! @value: @Returns: ! @value: @Returns: ! @value: @Returns: ! @value: @Returns: @value: @Returns: @value: @Returns: ! @value: @Returns: @value: @Returns: ! ! @value: ! @the_int: ! ! @value: ! @the_str: ! ! @value: ! @the_float: ! ! @value: ! @the_bool: ! ! @value: ! @sc: ! ! @value: ! @sc: ! ! @value: ! @car: ! ! @value: ! @car: ! ! @value: ! @cdr: ! ! @value: ! @cdr: ! ! @value: ! @type: ! ! @value: ! @list: ! ! @value: ! @list: ! ! @value: ! @Returns: *************** *** 440,447 **** @gcmi: @Returns: - - @x: --- 310,315 ---- *************** *** 451,458 **** @gcmi: @Returns: - - @x: --- 319,324 ---- *************** *** 462,469 **** @gcmi: @Returns: - - @x: --- 328,333 ---- *************** *** 495,572 **** - Stores an entry from a GConf "directory," including a key-value pair, - the name of the schema applicable to this entry, whether the value is - a default value, and whether GConf can write a new value at this - key. @key should be an absolute key, not a relative key. (Note that - internally GConf breaks this rule sometimes; but in the public - interface, @key is always an absolute key.) To access the key and - value, use gconf_entry_get_key() and gconf_entry_get_value(). - ! Value can be NULL, indicating that the ! value is not set. ! @key: an absolute key name @value: ! Creates a new #GConfEntry with key @key and value @val. @key should be a full ! path to the key, starting with '/'. Neither the key nor the value is copied; ! both are freed when the #GConfEntry is freed. The string will be freed with ! g_free() so should be allocated with a GLib function, not malloc(). ! @key: the key name ! @val: the value ! @Returns: a new #GConfentry. ! Destroys a #GConfEntry, freeing the key, the value, and the entry itself. ! @entry: a #GConfEntry to free. ! Accesses the @key field of a #GConfEntry. The returned key is not a ! copy, and should not be freed or modified. @entry: @Returns: - - @x: a #GConfEntry. ! Accesses the @value field of a #GConfEntry. The returned value is not ! a copy, and should not be freed or modified. If you have called ! gconf_entry_steal_value(), the returned value will be ! NULL. @entry: @Returns: - - @x: a #GConfEntry. ! Extracts the value from a #GConfEntry, leaving the @value field in ! #GConfEntry set to NULL. Destroying the #GConfEntry ! will not destroy the value; the caller of ! gconf_entry_steal_value() assumes ownership of it. ! @entry: a #GConfEntry. ! @Returns: a #GConfValue that the caller must free. --- 359,413 ---- ! ! @key: @value: ! ! @key: ! @val: ! @Returns: ! ! @entry: ! @entry: @Returns: ! @entry: @Returns: ! ! @entry: ! @Returns: *************** *** 576,583 **** @entry: @Returns: - - @x: --- 417,422 ---- *************** *** 587,594 **** @entry: @Returns: - - @x: --- 426,431 ---- diff -crN ./GConf/doc/gconf/tmpl/gconf.sgml /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf.sgml *** ./GConf/doc/gconf/tmpl/gconf.sgml Tue Jan 21 04:30:30 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/doc/gconf/tmpl/gconf.sgml Sat Aug 9 21:12:02 2003 *************** *** 1,42 **** ! ! GConf Core Interfaces - Basic functions to initialize GConf and get/set values - These functions initialize GConf, and communicate with the - gconfd server via a - #GConfEngine object. You can install a notification - request on the server, get values, set values, list directories, and associate - schema names with keys. - - - Most of this interface is replicated in the #GtkObject wrapper - (#GConfClient object); an alternative to the value-setting functions - is the #GConfChangeSet interface. ! Initializes the GConf library. Creates a connection to a CORBA ORB, and ! initializes OAF (the object activation framework) if it isn't already ! initialized. @argc: @argv: ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: TRUE on success, FALSE otherwise. --- 1,30 ---- ! gconf + + ! @argc: @argv: ! @err: ! @Returns: *************** *** 59,173 **** ! Asks whether the library has been initialized. ! @Returns: TRUE if the library has been initialized. ! A callback function invoked when a key's value changes. The @cnxn_id parameter ! will be the connection ID returned from gconf_engine_notify_add(). @key will be the ! full path of the changed key, @value will be the new value if the key is set. ! If the key is unset, @value will be the default value if one exists, or ! NULL otherwise. @is_default indicates whether a value is a ! default setting or a user setting. If @value is NULL, ! @is_default will be TRUE. @user_data is the data passed to ! gconf_engine_notify_add(). ! @conf: the #GConfEngine passed to gconf_engine_notify_add(). ! @cnxn_id: the ID returned from gconf_engine_notify_add(). @entry: ! @user_data: the user data passed to gconf_engine_notify_add(). ! ! @key: the full path of the changed key. ! @value: the new value, or NULL if the key was unset. ! @is_default: if TRUE, the key is unset but this is the default value for it. ! Registers a notification request with the gconfd ! server. The server will notify the client when any key at or below ! @namespace_section is set or unset. Try to watch the smallest possible part of ! the namespace; otherwise you will slow down the server and your application with ! unnecessary notifications. Note that you should prefer gconf_client_notify_add() ! if you're using the #GtkObject wrapper library, because ! gconf_client_notify_add() does not require a client-server conversation for ! every callback. gconf_engine_notify_add() requests a different server notification for ! every callback. The function returns an ID you can use to remove the ! notification request; 0 is an invalid ID, and is returned if an error occurs. ! ! ! @conf: a #GConfEngine to monitor for changes. ! @namespace_section: the directory or key to watch; you will be notified of changes at or below this point. ! @func: the callback to invoke when a notification is received from the server. ! @user_data: the data to pass to the callback. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: an ID for the notification request, or 0 on error. ! Removes a notification request. ! @conf: the #GConfEngine you were monitoring for changes. ! @cnxn: The ID returned by gconf_engine_notify_add(). ! Returns the #GConfValue stored at @key, or NULL if no value is ! set. You must call gconf_value_free() to free the returned value. If you know ! the expected type of the value, you probably want to use the type-specific ! convenience wrappers (gconf_engine_get_int(), etc.) because they will do the ! type-checking for you and return the appropriate type. Automatically returns the ! default value for a key, if the key is unset and a default exists. ! @conf: a #GConfEngine to get the value from. ! @key: the key to get. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: newly-allocated #GConfValue, or NULL if unset and no default exists. ! Requests the value appropriate for a particular locale. Right now, ! only values of type %GCONF_VALUE_SCHEMA are localized; the locale is ! meaningless for other value types. Also, gconf_engine_get () automatically ! requests the value in the user's current locale. So this function is ! only useful if you want a schema for some locale other than the user's ! current locale. Except for the additional argument, this function is ! identical to gconf_engine_get () in all respects. ! @conf: a #GConfEngine to get the value from. ! @key: the key to get. ! @locale: preferred locale (as in the locale-related environment variables). ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: newly-allocated #GConfValue, or NULL if unset. ! Identical to gconf_engine_get (), except that it will return NULL in ! place of the default value if the key is unset. Note that gconf_engine_get () can also ! return NULL if no default exists or an error occurs. ! @conf: a #GConfEngine to get the value from. ! @key: the key to get. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: newly-allocated #GConfValue, or NULL if unset. ! Obtain the full #GConfEntry for a value. @conf: --- 47,128 ---- ! ! @Returns: ! ! @conf: ! @cnxn_id: @entry: ! @user_data: ! ! ! ! @conf: ! @namespace_section: ! @func: ! @user_data: ! @err: ! @Returns: ! ! @conf: ! @cnxn: ! ! @conf: ! @key: ! @err: ! @Returns: ! ! @conf: ! @key: ! @locale: ! @err: ! @Returns: ! ! @conf: ! @key: ! @err: ! @Returns: ! @conf: *************** *** 180,579 **** ! Returns the default value stored in the key's schema, if the key has a schema ! associated and the schema exists and the schema contains a default value. Note ! that gconf_engine_get (), gconf_engine_get_string(), and so on already return the default value ! if no other value is found, so normally you do not need this function. This ! function is just for convenience; you could also get the #GConfMetaInfo for the ! key, read the schema name from there, then look up the schema by name and ! extract the default value. ! @conf: a #GConfEngine to get the value from. ! @key: the key to get the default value for. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: newly-allocated #GConfValue, or NULL if unset. - Sets the value of @key to @value. Does not modify the passed-in - #GConfValue, you must free it yourself. You may prefer a type-specific - convenience wrapper, such as gconf_engine_set_int(). - - - An error of note is %GCONF_OVERRIDDEN, indicating that the system - administrator has "forced" a value for this key. If no writable - configuration sources exist, it is not an error, but GConf will just - forget all your values; this allows users to have a configuration-free - setup without a constant barrage of error messages. ! @conf: a #GConfEngine to set the value in. ! @key: the key to set. ! @value: the new value of @key. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: TRUE on success, FALSE on error. ! Unsets the value of @key; if @key is already unset, has no effect. An ! error of note is %GCONF_OVERRIDDEN, indicating that the system ! administrator has "forced" a value for this key. ! @conf: a #GConfEngine to affect. ! @key: the key to unset. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: TRUE on success, FALSE on error. ! Directs GConf to find the schema for @key at location ! @schema_key. That is, the value stored at @schema_key should have type ! #GCONF_VALUE_SCHEMA, and be descriptive of @key. Normally you don't ! call this function from C code; you can ship a special file with your ! application and ask gconftool to install ! schema associations into the database during "make install." ! @conf: a #GConfEngine to affect. ! @key: the key to associate the schema with. ! @schema_key: the key where the schema will be stored. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: TRUE on success, FALSE on error. ! Lists the key-value pairs in @dir. Does not list subdirectories; for ! that use gconf_engine_all_dirs(). The returned list contains #GConfEntry ! objects. A #GConfEntry contains a relative key ! and a value. The list is not recursive, it contains only the immediate ! children of @dir. To free the returned list, gconf_entry_free() ! each list element, then g_slist_free() the list itself. ! @conf: a #GConfEngine. ! @dir: Directory to list. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: List of #GConfEntry. ! Lists the subdirectories in @dir. The returned list contains allocated ! strings; you should g_free() each string in the list, then ! g_slist_free() the list itself. ! @conf: a #GConfEngine. ! @dir: Directory to get subdirectories from. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: List of allocated subdirectory names. ! Suggests to gconfd that you've just finished ! a block of changes, and it would be an optimal time to sync to ! permanent storage. This is only a suggestion; and ! gconfd will eventually sync even if you ! don't call gconf_engine_suggest_sync(). This function is just a "hint" ! provided to gconfd to maximize efficiency ! and minimize data loss. ! @conf: the #GConfEngine to suggest syncing to. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! Queries whether the directory @dir exists in the GConf ! database. Returns TRUE or FALSE. ! @conf: a #GConfEngine. ! @dir: Directory to check for. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: TRUE or FALSE. ! Asks whether a key is syntactically correct, that is, it ensures that ! the key consists of slash-separated strings and contains only legal ! characters. Normally you shouldn't need to call this function; the ! GConf functions all check this for you and return an error if the key ! is invalid. However, it may be useful to validate input to an entry ! field or the like. If you pass a non-NULL address as ! the @why_invalid argument, an allocated string is returned explaining ! why the key is invalid, if it is. If the key is valid the @why_invalid ! argument is unused. ! @key: key to check. ! @why_invalid: return location for an explanation of the problem, if any. g_free() the returned string. ! @Returns: TRUE if the key is valid, or FALSE if not. ! Asks whether the key @below would be found below the key @above, were ! they both to exist in the database. For example, /foo ! is always found below / and above ! /foo/bar. This probably isn't useful but GConf uses ! it internally so here it is if you need it. ! @above: the key on the "left hand side" of the predicate. ! @below: the key on the "right hand side." ! @Returns: TRUE or FALSE. ! Requests the floating point number (%GCONF_VALUE_FLOAT) stored at ! @key. Automatically performs type-checking, so if a non-float is ! stored at @key, an error is returned. On error, or if @key is unset, ! 0.0 is returned. ! @conf: a #GConfEngine. ! @key: key you want the value of. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: the value of @key, or 0.0 if no value is obtained. ! Requests the integer (%GCONF_VALUE_INT) stored at ! @key. Automatically performs type-checking, so if a non-integer is ! stored at @key, an error is returned. On error, or if @key is unset, ! 0 is returned. ! @conf: a #GConfEngine. ! @key: key you want the value of. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: the value of @key, or 0 if no value is obtained. ! Requests the string (%GCONF_VALUE_STRING) stored at ! @key. Automatically performs type-checking, so if a non-string is ! stored at @key, an error is returned. On error, or if @key is unset, ! NULL is returned. ! @conf: a #GConfEngine. ! @key: key you want the value of. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: allocated string (value of @key), or NULL if no value is obtained. ! Requests the boolean value (%GCONF_VALUE_BOOL) stored at ! @key. Automatically performs type-checking, so if a non-bool is ! stored at @key, an error is returned. On error, or if @key is unset, ! FALSE is returned. ! @conf: a #GConfEngine. ! @key: key you want the value of. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: the value of @key, or FALSE if no value is obtained. ! Requests the schema (%GCONF_VALUE_SCHEMA) stored at @key. ! Automatically performs type-checking, so if a non-schema is stored at ! @key, an error is returned. If no value is set or an error occurs, ! NULL is returned. ! @conf: a #GConfEngine. ! @key: key you want the value of. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: the value of @key as an allocated #GConfSchema, or NULL if no value was obtained. ! Requests the list (%GCONF_VALUE_LIST) stored at @key. Automatically ! performs type-checking, so if a non-list is stored at @key, or the ! list does not contain elements of type @list_type, an error is ! returned. If no value is set or an error occurs, NULL ! is returned. Note that NULL is also the empty list, ! so if you need to distinguish the empty list from an unset value, you ! must use gconf_engine_get () to obtain a raw #GConfValue. ! ! ! ! Remember that GConf lists can only store primitive types: ! %GCONF_VALUE_FLOAT, %GCONF_VALUE_INT, %GCONF_VALUE_BOOL, ! %GCONF_VALUE_STRING, %GCONF_VALUE_SCHEMA. Also remember ! that lists must be uniform, you may not mix types in the same list. ! ! ! ! The type of the list elements depends on @list_type. A #GConfValue ! with type %GCONF_VALUE_LIST normally stores a list of more #GConfValue ! objects. gconf_engine_get_list() automatically converts to primitive C ! types. Thus, the list->data fields in the returned list ! contain: ! ! ! ! ! ! ! %GCONF_VALUE_INT ! The integer itself, converted with GINT_TO_POINTER() ! ! ! ! %GCONF_VALUE_BOOL ! The bool itself, converted with GINT_TO_POINTER() ! ! ! ! %GCONF_VALUE_FLOAT ! A pointer to #gdouble, which should be freed with g_free() ! ! ! ! %GCONF_VALUE_STRING ! A pointer to #gchar, which should be freed with g_free() ! ! ! ! %GCONF_VALUE_SCHEMA ! A pointer to #GConfSchema, which should be freed with gconf_schema_free() ! ! ! ! ! In the %GCONF_VALUE_FLOAT and %GCONF_VALUE_STRING cases, you must ! g_free() each list element. In the %GCONF_VALUE_SCHEMA case you must ! gconf_schema_free() each element. In all cases you must free the ! list itself with g_slist_free(). ! ! ! @conf: a #GConfEngine. ! @key: key you want the value of. ! @list_type: type of each list element. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: an allocated list, with elements as described above. ! Requests the pair (%GCONF_VALUE_PAIR) stored at @key. Automatically ! performs type-checking, so if a non-pair is stored at @key, or the ! pair does not have the right @car_type and @cdr_type, an error is ! returned. Remember that the car of a pair is ! its first value, and the cdr is its second ! value, in the Lisp tradition. ! ! ! ! Remember that GConf pairs can only store primitive types: ! %GCONF_VALUE_FLOAT, %GCONF_VALUE_INT, %GCONF_VALUE_BOOL, ! %GCONF_VALUE_STRING, %GCONF_VALUE_SCHEMA. ! ! ! ! gconf_engine_get_pair() stores the two fields of the pair in the locations ! pointed to by @car_retloc and @cdr_retloc. The type of these pointers ! depends on the corresponding @car_type and @cdr_type: ! ! ! ! ! ! ! %GCONF_VALUE_INT ! pointer to #gint ! ! ! ! %GCONF_VALUE_BOOL ! pointer to #gboolean ! ! ! ! %GCONF_VALUE_FLOAT ! pointer to #gdouble ! ! ! ! %GCONF_VALUE_STRING ! pointer to #gchar* ! ! ! ! %GCONF_VALUE_SCHEMA ! pointer to #GConfSchema* ! ! ! ! ! In the %GCONF_VALUE_STRING case, you must g_free() the string(s) ! stored in the return location(s). In the %GCONF_VALUE_SCHEMA case you ! must gconf_schema_free() the returned schema. If there's an error ! or the value is unset, @car_retloc and @cdr_retloc are left unchanged. ! ! ! ! gconf_engine_get_pair() returns TRUE on success. ! ! ! ! An example of gconf_engine_get_pair() in action: ! ! gdouble car = 10.0; ! gchar* cdr = NULL; ! GError* error = NULL; ! ! if (!gconf_engine_get_pair(conf, "/foo", ! GCONF_VALUE_FLOAT, ! GCONF_VALUE_STRING, ! &car, &cdr, &error)) ! { ! /* Note: car/cdr should be untouched, because an error occurred */ ! g_assert(error != NULL); ! fprintf(stderr, "Error: %s\n", error->message); ! g_error_free(error); ! error = NULL; ! } ! else ! { ! /* Note: car/cdr may be untouched even though there was no error, ! if no value was set for "/foo" ! */ ! printf("Found pair (%g,%s)\n", car, cdr); ! if (cdr != NULL) ! g_free(cdr); ! } ! ! ! ! @conf: a #GConfEngine. ! @key: key you want the value of. ! @car_type: desired type of the pair's first field (car). ! @cdr_type: desired type of the pair's second field (cdr). ! @car_retloc: address of a return location for the car. ! @cdr_retloc: address of a return location for the cdr. ! @err: the return location for an allocated #GError, or NULL to ignore errors. ! @Returns: TRUE on success, FALSE on error. --- 135,326 ---- ! ! @conf: ! @key: ! @err: ! @Returns: ! @conf: ! @key: ! @value: ! @err: ! @Returns: ! ! @conf: ! @key: ! @err: ! @Returns: ! ! @conf: ! @key: ! @schema_key: ! @err: ! @Returns: ! ! @conf: ! @dir: ! @err: ! @Returns: ! ! @conf: ! @dir: ! @err: ! @Returns: ! ! @conf: ! @err: ! ! @conf: ! @dir: ! @err: ! @Returns: ! ! @key: ! @why_invalid: ! @Returns: ! ! @above: ! @below: ! @Returns: ! ! @conf: ! @key: ! @err: ! @Returns: ! ! @conf: ! @key: ! @err: ! @Returns: ! ! @conf: ! @key: ! @err: ! @Returns: ! ! @conf: ! @key: ! @err: ! @Returns: ! ! @conf: ! @key: ! @err: ! @Returns: ! ! ! ! @conf: ! @key: ! @list_type: ! @err: ! @Returns: ! ! ! ! @conf: ! @key: ! @car_type: ! @cdr_type: ! @car_retloc: ! @cdr_retloc: ! @err: ! @Returns: *************** *** 581,590 **** ! @conf: a #GConfEngine. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 328,337 ---- ! @conf: @key: @val: ! @err: @Returns: *************** *** 593,602 **** ! @conf: a #GConfEngine. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 340,349 ---- ! @conf: @key: @val: ! @err: @Returns: *************** *** 605,614 **** ! @conf: a #GConfEngine. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 352,361 ---- ! @conf: @key: @val: ! @err: @Returns: *************** *** 617,626 **** ! @conf: a #GConfEngine. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 364,373 ---- ! @conf: @key: @val: ! @err: @Returns: *************** *** 629,638 **** ! @conf: a #GConfEngine. @key: @val: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 376,385 ---- ! @conf: @key: @val: ! @err: @Returns: *************** *** 641,651 **** ! @conf: a #GConfEngine. @key: @list_type: @list: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 388,398 ---- ! @conf: @key: @list_type: @list: ! @err: @Returns: *************** *** 654,666 **** ! @conf: a #GConfEngine. @key: @car_type: @cdr_type: @address_of_car: @address_of_cdr: ! @err: the return location for an allocated #GError, or NULL to ignore errors. @Returns: --- 401,413 ---- ! @conf: @key: @car_type: @cdr_type: @address_of_car: @address_of_cdr: ! @err: @Returns: *************** *** 674,717 **** - It's best to store enumeration values as strings rather than integers. This is - robust against changes in the enumeration, and also human-readable. - This function makes it more convenient to store enums as strings. - - - - The first argument is a lookup table, typically declared statically as follows: - - static GConfEnumStringPair foo_enum_lookup_table[] = { - { FOO_BLAH, "Blah" }, - { FOO_BAR, "Bar" }, - { 0, NULL } - }; - - Note that the last element of the table is { 0, NULL }. - Typically the strings you use should be semi-human-readable, for GTK+ and GNOME - stripping off the library prefix and converting to StudlyCaps is the recommended - convention. - - - The function returns TRUE if a match for the string is found, - and if a match is found the enum value is placed in @enum_value_retloc. ! @lookup_table: a lookup table mapping enum values to strings. ! @str: the string to convert to an enum value. ! @enum_value_retloc: the address of an enum variable. ! @Returns: TRUE if a match was found. ! See gconf_string_to_enum() for background information on this function. ! @lookup_table: a lookup table mapping enum values to strings. ! @enum_value: the enumeration value to convert to a string. ! @Returns: a pointer to the proper string in the lookup table, or NULL if no match was found. --- 421,442 ---- ! @lookup_table: ! @str: ! @enum_value_retloc: ! @Returns: ! ! @lookup_table: ! @enum_value: ! @Returns: diff -crN ./GConf/examples/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/examples/Makefile.in *** ./GConf/examples/Makefile.in Tue Jan 21 04:30:31 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/examples/Makefile.in Sat Aug 9 21:09:16 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,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** 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 = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ BDB_CFLAGS = @BDB_CFLAGS@ *************** *** 72,77 **** --- 71,77 ---- CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ + DEPDIR = @DEPDIR@ DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ DEPENDENT_LIBS = @DEPENDENT_LIBS@ DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ *************** *** 100,105 **** --- 100,106 ---- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INDENT = @INDENT@ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ *************** *** 109,115 **** LN_S = @LN_S@ MAINT = @MAINT@ MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 110,115 ---- *************** *** 129,141 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ gconflocaledir = @gconflocaledir@ l = @l@ ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(DEPENDENT_WITH_GTK_CFLAGS) -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\" EFENCE = @GTK_TRUE@GTK_EXAMPLES = basic-gconf-app simple-view simple-controller complex-gconf-app @GTK_FALSE@GTK_EXAMPLES = --- 129,147 ---- USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ + am__include = @am__include@ + am__quote = @am__quote@ gconflocaledir = @gconflocaledir@ + install_sh = @install_sh@ l = @l@ ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ ! $(DEPENDENT_WITH_GTK_CFLAGS) \ ! -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\" EFENCE = + @GTK_TRUE@GTK_EXAMPLES = basic-gconf-app simple-view simple-controller complex-gconf-app @GTK_FALSE@GTK_EXAMPLES = *************** *** 158,258 **** complex_gconf_app_SOURCES = basic-gconf-app.c complex_gconf_app_LDADD = $(GTK_EXAMPLES_LINK) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! @GTK_FALSE@noinst_PROGRAMS = ! @GTK_TRUE@noinst_PROGRAMS = basic-gconf-app$(EXEEXT) \ ! @GTK_TRUE@simple-view$(EXEEXT) simple-controller$(EXEEXT) \ ! @GTK_TRUE@complex-gconf-app$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! basic_gconf_app_OBJECTS = basic-gconf-app.$(OBJEXT) ! basic_gconf_app_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! basic_gconf_app_LDFLAGS = ! simple_view_OBJECTS = simple-view.$(OBJEXT) ! simple_view_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! simple_view_LDFLAGS = ! simple_controller_OBJECTS = simple-controller.$(OBJEXT) ! simple_controller_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! simple_controller_LDFLAGS = ! complex_gconf_app_OBJECTS = basic-gconf-app.$(OBJEXT) ! complex_gconf_app_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! complex_gconf_app_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 = $(basic_gconf_app_SOURCES) $(simple_view_SOURCES) $(simple_controller_SOURCES) $(complex_gconf_app_SOURCES) - OBJECTS = $(basic_gconf_app_OBJECTS) $(simple_view_OBJECTS) $(simple_controller_OBJECTS) $(complex_gconf_app_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 examples/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! 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 --- 164,222 ---- complex_gconf_app_SOURCES = basic-gconf-app.c complex_gconf_app_LDADD = $(GTK_EXAMPLES_LINK) + subdir = examples mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! @GTK_TRUE@noinst_PROGRAMS = basic-gconf-app$(EXEEXT) \ ! @GTK_TRUE@ simple-view$(EXEEXT) simple-controller$(EXEEXT) \ ! @GTK_TRUE@ complex-gconf-app$(EXEEXT) ! @GTK_FALSE@noinst_PROGRAMS = ! PROGRAMS = $(noinst_PROGRAMS) ! ! am_basic_gconf_app_OBJECTS = basic-gconf-app.$(OBJEXT) ! basic_gconf_app_OBJECTS = $(am_basic_gconf_app_OBJECTS) ! basic_gconf_app_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! basic_gconf_app_LDFLAGS = ! am_complex_gconf_app_OBJECTS = basic-gconf-app.$(OBJEXT) ! complex_gconf_app_OBJECTS = $(am_complex_gconf_app_OBJECTS) ! complex_gconf_app_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! complex_gconf_app_LDFLAGS = ! am_simple_controller_OBJECTS = simple-controller.$(OBJEXT) ! simple_controller_OBJECTS = $(am_simple_controller_OBJECTS) ! simple_controller_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! simple_controller_LDFLAGS = ! am_simple_view_OBJECTS = simple-view.$(OBJEXT) ! simple_view_OBJECTS = $(am_simple_view_OBJECTS) ! simple_view_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! simple_view_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = ! 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 = $(basic_gconf_app_SOURCES) $(complex_gconf_app_SOURCES) \ ! $(simple_controller_SOURCES) $(simple_view_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in ! SOURCES = $(basic_gconf_app_SOURCES) $(complex_gconf_app_SOURCES) $(simple_controller_SOURCES) $(simple_view_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj mostlyclean-libtool: -rm -f *.lo *************** *** 261,419 **** -rm -rf .libs _libs distclean-libtool: ! maintainer-clean-libtool: ! ! basic-gconf-app$(EXEEXT): $(basic_gconf_app_OBJECTS) $(basic_gconf_app_DEPENDENCIES) @rm -f basic-gconf-app$(EXEEXT) $(LINK) $(basic_gconf_app_LDFLAGS) $(basic_gconf_app_OBJECTS) $(basic_gconf_app_LDADD) $(LIBS) ! ! simple-view$(EXEEXT): $(simple_view_OBJECTS) $(simple_view_DEPENDENCIES) @rm -f simple-view$(EXEEXT) $(LINK) $(simple_view_LDFLAGS) $(simple_view_OBJECTS) $(simple_view_LDADD) $(LIBS) ! simple-controller$(EXEEXT): $(simple_controller_OBJECTS) $(simple_controller_DEPENDENCIES) ! @rm -f simple-controller$(EXEEXT) ! $(LINK) $(simple_controller_LDFLAGS) $(simple_controller_OBJECTS) $(simple_controller_LDADD) $(LIBS) ! complex-gconf-app$(EXEEXT): $(complex_gconf_app_OBJECTS) $(complex_gconf_app_DEPENDENCIES) ! @rm -f complex-gconf-app$(EXEEXT) ! $(LINK) $(complex_gconf_app_LDFLAGS) $(complex_gconf_app_OBJECTS) $(complex_gconf_app_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 = examples 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 - basic-gconf-app.o: basic-gconf-app.c ../gconf/gconf-client.h \ - ../gconf/gconf.h ../gconf/gconf-schema.h ../gconf/gconf-value.h \ - ../gconf/gconf-error.h ../gconf/gconf-engine.h \ - ../gconf/gconf-enum-types.h ../gconf/gconf-listeners.h \ - ../gconf/gconf-changeset.h - simple-controller.o: simple-controller.c ../gconf/gconf-client.h \ - ../gconf/gconf.h ../gconf/gconf-schema.h ../gconf/gconf-value.h \ - ../gconf/gconf-error.h ../gconf/gconf-engine.h \ - ../gconf/gconf-enum-types.h ../gconf/gconf-listeners.h \ - ../gconf/gconf-changeset.h - simple-view.o: simple-view.c ../gconf/gconf-client.h ../gconf/gconf.h \ - ../gconf/gconf-schema.h ../gconf/gconf-value.h \ - ../gconf/gconf-error.h ../gconf/gconf-engine.h \ - ../gconf/gconf-enum-types.h ../gconf/gconf-listeners.h \ - ../gconf/gconf-changeset.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-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 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. --- 225,401 ---- -rm -rf .libs _libs distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps examples/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status ! clean-noinstPROGRAMS: ! -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! basic-gconf-app$(EXEEXT): $(basic_gconf_app_OBJECTS) $(basic_gconf_app_DEPENDENCIES) @rm -f basic-gconf-app$(EXEEXT) $(LINK) $(basic_gconf_app_LDFLAGS) $(basic_gconf_app_OBJECTS) $(basic_gconf_app_LDADD) $(LIBS) ! complex-gconf-app$(EXEEXT): $(complex_gconf_app_OBJECTS) $(complex_gconf_app_DEPENDENCIES) ! @rm -f complex-gconf-app$(EXEEXT) ! $(LINK) $(complex_gconf_app_LDFLAGS) $(complex_gconf_app_OBJECTS) $(complex_gconf_app_LDADD) $(LIBS) ! simple-controller$(EXEEXT): $(simple_controller_OBJECTS) $(simple_controller_DEPENDENCIES) ! @rm -f simple-controller$(EXEEXT) ! $(LINK) $(simple_controller_LDFLAGS) $(simple_controller_OBJECTS) $(simple_controller_LDADD) $(LIBS) ! simple-view$(EXEEXT): $(simple_view_OBJECTS) $(simple_view_DEPENDENCIES) @rm -f simple-view$(EXEEXT) $(LINK) $(simple_view_LDFLAGS) $(simple_view_OBJECTS) $(simple_view_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 `cygpath -w $<` ! ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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 $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || 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: 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)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* 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 ! ! uninstall-am: uninstall-info-am + .PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS 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 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. diff -crN ./GConf/gconf/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/gconf/Makefile.in *** ./GConf/gconf/Makefile.in Tue Jan 21 04:30:18 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/gconf/Makefile.in Sat Aug 9 21:09: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,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** 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 = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ BDB_CFLAGS = @BDB_CFLAGS@ *************** *** 72,77 **** --- 71,77 ---- CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ + DEPDIR = @DEPDIR@ DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ DEPENDENT_LIBS = @DEPENDENT_LIBS@ DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ *************** *** 100,105 **** --- 100,106 ---- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INDENT = @INDENT@ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ *************** *** 109,115 **** LN_S = @LN_S@ MAINT = @MAINT@ MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 110,115 ---- *************** *** 129,145 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ gconflocaledir = @gconflocaledir@ l = @l@ NULL = GCONFD_BINARY_NAME = gconfd-2 ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) -DG_LOG_DOMAIN=\"GConf\" -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" -DGCONF_BINDIR=\""$(bindir)"\" -DGCONF_SERVERDIR=\""$(libexecdir)"\" -DGCONF_BUILDDIR=\""$(top_builddir)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" -DVERSION=\""$(VERSION)"\" -DGCONF_ENABLE_INTERNALS=1 -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" $(NULL) EFENCE = @GTK_TRUE@SANITY_CHECK = gconf-sanity-check-2 @GTK_FALSE@SANITY_CHECK = --- 129,165 ---- USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ + am__include = @am__include@ + am__quote = @am__quote@ gconflocaledir = @gconflocaledir@ + install_sh = @install_sh@ l = @l@ NULL = GCONFD_BINARY_NAME = gconfd-2 ! INCLUDES = \ ! -I$(top_srcdir) \ ! -I$(top_builddir) \ ! $(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) \ ! -DG_LOG_DOMAIN=\"GConf\" \ ! -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" \ ! -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \ ! -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \ ! -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \ ! -DGCONF_BINDIR=\""$(bindir)"\" \ ! -DGCONF_SERVERDIR=\""$(libexecdir)"\" \ ! -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ ! -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ ! -DVERSION=\""$(VERSION)"\" \ ! -DGCONF_ENABLE_INTERNALS=1 \ ! -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" \ ! $(NULL) EFENCE = + @GTK_TRUE@SANITY_CHECK = gconf-sanity-check-2 @GTK_FALSE@SANITY_CHECK = *************** *** 150,189 **** CORBA_SOURCECODE = GConfX-common.c GConfX-skels.c GConfX-stubs.c GConfX.h ! built_sourcecode = $(CORBA_SOURCECODE) gconfmarshal.h gconfmarshal.c ! ! ! CLEANFILES = $(built_sourcecode) stamp-gconfmarshal.h stamp-gconfmarshal.c stamp-gconfmarshal.h stamp-gconfmarshal.c ! ! ! gconf_headers = gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf ! gconfinclude_HEADERS = $(gconf_headers) gconf-enum-types.h ! gconfd_2_SOURCES = gconf-database.h gconf-database.c gconf-sources.h gconfd.h gconfd.c gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la # gconf_testclient_SOURCES = \ # testclient.c # gconf_testclient_LDADD = $(GLIB_LIBS) $(OAF_LIBS) libgconf-client.la ! ! gconftool_2_SOURCES = gconftool.c gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la ! gconf_sanity_check_2_SOURCES = gconf-sanity-check.c gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la ! libgconf_2_la_SOURCES = gconf-internals.c gconf-internals.h gconf-backend.h gconf-backend.c gconf-changeset.c gconf-error.c gconf-listeners.c gconf-locale.h gconf-locale.c gconf-schema.c gconf-sources.c gconf-value.c gconf.c gconf-client.c gconf-enum-types.c $(CORBA_SOURCECODE) libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) --- 170,250 ---- CORBA_SOURCECODE = GConfX-common.c GConfX-skels.c GConfX-stubs.c GConfX.h ! built_sourcecode = \ ! $(CORBA_SOURCECODE) \ ! gconfmarshal.h \ ! gconfmarshal.c ! ! ! CLEANFILES = \ ! $(built_sourcecode) \ ! stamp-gconfmarshal.h \ ! stamp-gconfmarshal.c \ ! stamp-gconfmarshal.h \ ! stamp-gconfmarshal.c ! ! ! gconf_headers = \ ! gconf.h \ ! gconf-changeset.h \ ! gconf-listeners.h \ ! gconf-schema.h \ ! gconf-value.h \ ! gconf-error.h \ ! gconf-engine.h \ ! gconf-client.h gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf ! gconfinclude_HEADERS = \ ! $(gconf_headers) \ ! gconf-enum-types.h ! gconfd_2_SOURCES = \ ! gconf-database.h \ ! gconf-database.c \ ! gconf-sources.h \ ! gconfd.h \ ! gconfd.c gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la + # gconf_testclient_SOURCES = \ # testclient.c # gconf_testclient_LDADD = $(GLIB_LIBS) $(OAF_LIBS) libgconf-client.la ! gconftool_2_SOURCES = \ ! gconftool.c gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la ! gconf_sanity_check_2_SOURCES = \ ! gconf-sanity-check.c gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) $(POPT_LIBS) libgconf-$(MAJOR_VERSION).la ! libgconf_2_la_SOURCES = \ ! gconf-internals.c \ ! gconf-internals.h \ ! gconf-backend.h \ ! gconf-backend.c \ ! gconf-changeset.c \ ! gconf-error.c \ ! gconf-listeners.c \ ! gconf-locale.h \ ! gconf-locale.c \ ! gconf-schema.c \ ! gconf-sources.c \ ! gconf-value.c \ ! gconf.c \ ! gconf-client.c \ ! gconf-enum-types.c \ ! $(CORBA_SOURCECODE) libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) *************** *** 191,608 **** libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) EXTRA_DIST = GConfX.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = default.path ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! libgconf_2_la_DEPENDENCIES = ! libgconf_2_la_OBJECTS = gconf-internals.lo gconf-backend.lo \ ! gconf-changeset.lo gconf-error.lo gconf-listeners.lo gconf-locale.lo \ ! gconf-schema.lo gconf-sources.lo gconf-value.lo gconf.lo \ ! gconf-client.lo gconf-enum-types.lo GConfX-common.lo GConfX-skels.lo \ ! GConfX-stubs.lo ! bin_PROGRAMS = gconftool-2$(EXEEXT) ! @GTK_FALSE@libexec_PROGRAMS = gconfd-2$(EXEEXT) ! @GTK_TRUE@libexec_PROGRAMS = gconfd-2$(EXEEXT) \ ! @GTK_TRUE@gconf-sanity-check-2$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) ! ! gconftool_2_OBJECTS = gconftool.$(OBJEXT) ! gconftool_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la ! gconftool_2_LDFLAGS = ! gconfd_2_OBJECTS = gconf-database.$(OBJEXT) gconfd.$(OBJEXT) ! gconfd_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la ! gconfd_2_LDFLAGS = ! gconf_sanity_check_2_OBJECTS = gconf-sanity-check.$(OBJEXT) ! gconf_sanity_check_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la ! gconf_sanity_check_2_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 $@ ! HEADERS = $(gconfinclude_HEADERS) ! ! DIST_COMMON = Makefile.am Makefile.in default.path.in ! ! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - TAR = gtar - GZIP_ENV = --best - SOURCES = $(libgconf_2_la_SOURCES) $(gconftool_2_SOURCES) $(gconfd_2_SOURCES) $(gconf_sanity_check_2_SOURCES) - OBJECTS = $(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS) $(gconf_sanity_check_2_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 gconf/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! cd $(top_builddir) \ ! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status ! default.path: $(top_builddir)/config.status default.path.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 ! ! clean-libtool: ! -rm -rf .libs _libs ! ! distclean-libtool: ! ! maintainer-clean-libtool: ! ! libgconf-2.la: $(libgconf_2_la_OBJECTS) $(libgconf_2_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libgconf_2_la_LDFLAGS) $(libgconf_2_la_OBJECTS) $(libgconf_2_la_LIBADD) $(LIBS) - - 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 ! mostlyclean-libexecPROGRAMS: ! ! clean-libexecPROGRAMS: ! -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) ! ! distclean-libexecPROGRAMS: ! ! maintainer-clean-libexecPROGRAMS: ! install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libexecdir) @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ! if test -f $$p; then \ ! echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ! $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-libexecPROGRAMS: @$(NORMAL_UNINSTALL) ! list='$(libexec_PROGRAMS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(libexecdir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done ! gconftool-2$(EXEEXT): $(gconftool_2_OBJECTS) $(gconftool_2_DEPENDENCIES) @rm -f gconftool-2$(EXEEXT) $(LINK) $(gconftool_2_LDFLAGS) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS) ! gconfd-2$(EXEEXT): $(gconfd_2_OBJECTS) $(gconfd_2_DEPENDENCIES) ! @rm -f gconfd-2$(EXEEXT) ! $(LINK) $(gconfd_2_LDFLAGS) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS) ! gconf-sanity-check-2$(EXEEXT): $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_DEPENDENCIES) ! @rm -f gconf-sanity-check-2$(EXEEXT) ! $(LINK) $(gconf_sanity_check_2_LDFLAGS) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS) install-gconfincludeHEADERS: $(gconfinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(gconfincludedir) @list='$(gconfinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ ! echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gconfincludedir)/$$p"; \ ! $(INSTALL_DATA) $$d$$p $(DESTDIR)$(gconfincludedir)/$$p; \ done uninstall-gconfincludeHEADERS: @$(NORMAL_UNINSTALL) ! list='$(gconfinclude_HEADERS)'; for p in $$list; do \ ! rm -f $(DESTDIR)$(gconfincludedir)/$$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 = gconf 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 ! gconf-backend.lo gconf-backend.o : gconf-backend.c gconf-backend.h \ ! gconf-internals.h ../config.h gconf-error.h gconf-value.h \ ! gconf-engine.h gconf-sources.h GConfX.h gconf-internals.h ! gconf-changeset.lo gconf-changeset.o : gconf-changeset.c \ ! gconf-changeset.h gconf.h gconf-schema.h gconf-value.h \ ! gconf-error.h gconf-engine.h gconf-enum-types.h \ ! gconf-internals.h ../config.h gconf-error.h gconf-value.h \ ! gconf-engine.h gconf-sources.h GConfX.h ! gconf-client.lo gconf-client.o : gconf-client.c gconf-client.h gconf.h \ ! gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h \ ! gconf-enum-types.h gconf-listeners.h gconf-changeset.h \ ! gconf-internals.h ../config.h gconf-sources.h GConfX.h \ ! gconfmarshal.h gconfmarshal.c ! GConf-common.lo GConf-common.o : GConf-common.c GConf.h ! gconf-database.o: gconf-database.c gconf-database.h gconf-error.h \ ! GConfX.h gconf-listeners.h gconf-sources.h gconf-value.h \ ! gconf-internals.h ../config.h gconf-engine.h gconf-error.h \ ! gconf-locale.h gconfd.h ! gconf-enum-types.lo gconf-enum-types.o : gconf-enum-types.c \ ! gconf-client.h gconf.h gconf-schema.h gconf-value.h \ ! gconf-error.h gconf-engine.h gconf-enum-types.h \ ! gconf-listeners.h gconf-changeset.h ! gconf-error.lo gconf-error.o : gconf-error.c gconf-error.h \ ! gconf-internals.h ../config.h gconf-value.h gconf-engine.h \ ! gconf-error.h gconf-sources.h GConfX.h ! gconf-internals.lo gconf-internals.o : gconf-internals.c ../config.h \ ! gconf-internals.h gconf-error.h gconf-value.h gconf-engine.h \ ! gconf-error.h gconf-sources.h GConfX.h gconf-backend.h \ ! gconf-internals.h gconf-sources.h gconf-schema.h gconf-value.h \ ! gconf.h gconf-schema.h gconf-engine.h gconf-enum-types.h ! gconf-listeners.lo gconf-listeners.o : gconf-listeners.c \ ! gconf-listeners.h gconf.h gconf-schema.h gconf-value.h \ ! gconf-error.h gconf-engine.h gconf-enum-types.h ! gconf-locale.lo gconf-locale.o : gconf-locale.c gconf-locale.h \ ! gconf-internals.h ../config.h gconf-error.h gconf-value.h \ ! gconf-engine.h gconf-error.h gconf-sources.h GConfX.h ! gconf-sanity-check.o: gconf-sanity-check.c gconf.h gconf-schema.h \ ! gconf-value.h gconf-error.h gconf-engine.h gconf-enum-types.h \ ! gconf-internals.h ../config.h gconf-error.h gconf-value.h \ ! gconf-engine.h gconf-sources.h GConfX.h ! gconf-schema.lo gconf-schema.o : gconf-schema.c gconf-schema.h \ ! gconf-value.h gconf-error.h gconf-internals.h ../config.h \ ! gconf-error.h gconf-value.h gconf-engine.h gconf-sources.h \ ! GConfX.h ! GConf-skels.lo GConf-skels.o : GConf-skels.c GConf.h ! gconf-sources.lo gconf-sources.o : gconf-sources.c gconf-backend.h \ ! gconf-internals.h ../config.h gconf-error.h gconf-value.h \ ! gconf-engine.h gconf-sources.h GConfX.h gconf-sources.h \ ! gconf-internals.h gconf-schema.h gconf.h gconf-schema.h \ ! gconf-enum-types.h ! GConf-stubs.lo GConf-stubs.o : GConf-stubs.c GConf.h ! gconf-value.lo gconf-value.o : gconf-value.c gconf-value.h gconf-error.h \ ! gconf-schema.h gconf-value.h gconf-internals.h ../config.h \ ! gconf-engine.h gconf-error.h gconf-sources.h GConfX.h ! gconf.lo gconf.o : gconf.c GConfX.h gconf.h gconf-schema.h gconf-value.h \ ! gconf-error.h gconf-engine.h gconf-enum-types.h \ ! gconf-internals.h ../config.h gconf-error.h gconf-value.h \ ! gconf-engine.h gconf-sources.h gconf-locale.h ! gconfd.o: gconfd.c ../config.h gconf-internals.h gconf-error.h \ ! gconf-value.h gconf-engine.h gconf-error.h gconf-sources.h \ ! GConfX.h gconf-listeners.h gconf-locale.h gconf-schema.h \ ! gconf-value.h gconf.h gconf-schema.h gconf-engine.h \ ! gconf-enum-types.h gconfd.h gconf-database.h ! gconftool.o: gconftool.c gconf.h gconf-schema.h gconf-value.h \ ! gconf-error.h gconf-engine.h gconf-enum-types.h \ ! gconf-internals.h ../config.h gconf-error.h gconf-value.h \ ! gconf-engine.h gconf-sources.h GConfX.h ! GConfX-common.lo GConfX-common.o : GConfX-common.c GConfX.h ! GConfX-skels.lo GConfX-skels.o : GConfX-skels.c GConfX.h ! GConfX-stubs.lo GConfX-stubs.o : GConfX-stubs.c GConfX.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-binPROGRAMS \ ! install-libexecPROGRAMS ! install-exec: install-exec-am - install-data-am: install-gconfincludeHEADERS 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-libLTLIBRARIES uninstall-binPROGRAMS \ ! uninstall-libexecPROGRAMS uninstall-gconfincludeHEADERS uninstall: uninstall-am - all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install - installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(libexecdir) $(DESTDIR)$(gconfincludedir) mostlyclean-generic: clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) 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-binPROGRAMS \ ! mostlyclean-libexecPROGRAMS mostlyclean-tags \ ! mostlyclean-generic ! mostlyclean: mostlyclean-am ! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \ ! clean-binPROGRAMS clean-libexecPROGRAMS clean-tags \ ! clean-generic mostlyclean-am ! clean: clean-am ! distclean-am: distclean-libLTLIBRARIES distclean-compile \ ! distclean-libtool distclean-binPROGRAMS \ ! distclean-libexecPROGRAMS 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-binPROGRAMS \ ! maintainer-clean-libexecPROGRAMS 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 mostlyclean-binPROGRAMS distclean-binPROGRAMS \ ! clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \ ! install-binPROGRAMS mostlyclean-libexecPROGRAMS \ ! distclean-libexecPROGRAMS clean-libexecPROGRAMS \ ! maintainer-clean-libexecPROGRAMS uninstall-libexecPROGRAMS \ ! install-libexecPROGRAMS uninstall-gconfincludeHEADERS \ ! install-gconfincludeHEADERS 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-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 $(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sourcecode) --- 252,589 ---- libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) EXTRA_DIST = GConfX.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh + subdir = gconf mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = default.path ! LTLIBRARIES = $(lib_LTLIBRARIES) ! ! libgconf_2_la_DEPENDENCIES = ! am_libgconf_2_la_OBJECTS = gconf-internals.lo gconf-backend.lo \ ! gconf-changeset.lo gconf-error.lo gconf-listeners.lo \ ! gconf-locale.lo gconf-schema.lo gconf-sources.lo gconf-value.lo \ ! gconf.lo gconf-client.lo gconf-enum-types.lo GConfX-common.lo \ ! GConfX-skels.lo GConfX-stubs.lo ! libgconf_2_la_OBJECTS = $(am_libgconf_2_la_OBJECTS) ! bin_PROGRAMS = gconftool-2$(EXEEXT) ! @GTK_TRUE@libexec_PROGRAMS = gconfd-2$(EXEEXT) \ ! @GTK_TRUE@ gconf-sanity-check-2$(EXEEXT) ! @GTK_FALSE@libexec_PROGRAMS = gconfd-2$(EXEEXT) ! PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) ! ! am_gconf_sanity_check_2_OBJECTS = gconf-sanity-check.$(OBJEXT) ! gconf_sanity_check_2_OBJECTS = $(am_gconf_sanity_check_2_OBJECTS) ! gconf_sanity_check_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la ! gconf_sanity_check_2_LDFLAGS = ! am_gconfd_2_OBJECTS = gconf-database.$(OBJEXT) gconfd.$(OBJEXT) ! gconfd_2_OBJECTS = $(am_gconfd_2_OBJECTS) ! gconfd_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la ! gconfd_2_LDFLAGS = ! am_gconftool_2_OBJECTS = gconftool.$(OBJEXT) ! gconftool_2_OBJECTS = $(am_gconftool_2_OBJECTS) ! gconftool_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la ! gconftool_2_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = ! 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 = $(libgconf_2_la_SOURCES) $(gconf_sanity_check_2_SOURCES) \ ! $(gconfd_2_SOURCES) $(gconftool_2_SOURCES) ! HEADERS = $(gconfinclude_HEADERS) ! ! DIST_COMMON = $(gconfinclude_HEADERS) Makefile.am Makefile.in \ ! default.path.in ! SOURCES = $(libgconf_2_la_SOURCES) $(gconf_sanity_check_2_SOURCES) $(gconfd_2_SOURCES) $(gconftool_2_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj ! mostlyclean-libtool: ! -rm -f *.lo ! clean-libtool: ! -rm -rf .libs _libs + distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps gconf/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status + default.path: $(top_builddir)/config.status default.path.in + cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status 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) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p"; \ ! $(LIBTOOL) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$p; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) ! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ ! 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) ! libgconf-2.la: $(libgconf_2_la_OBJECTS) $(libgconf_2_la_DEPENDENCIES) $(LINK) -rpath $(libdir) $(libgconf_2_la_LDFLAGS) $(libgconf_2_la_OBJECTS) $(libgconf_2_la_LIBADD) $(LIBS) 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 '$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \ else :; fi; \ done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(bin_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(bindir)/$$f"; \ ! rm -f $(DESTDIR)$(bindir)/$$f; \ done ! clean-binPROGRAMS: ! -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) install-libexecPROGRAMS: $(libexec_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(libexecdir) @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ! p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ ! if test -f $$p \ ! || test -f $$p1 \ ! ; then \ ! f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$f"; \ ! $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libexecdir)/$$f; \ else :; fi; \ done uninstall-libexecPROGRAMS: @$(NORMAL_UNINSTALL) ! @list='$(libexec_PROGRAMS)'; for p in $$list; do \ ! f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ ! echo " rm -f $(DESTDIR)$(libexecdir)/$$f"; \ ! rm -f $(DESTDIR)$(libexecdir)/$$f; \ done ! clean-libexecPROGRAMS: ! -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) ! gconf-sanity-check-2$(EXEEXT): $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_DEPENDENCIES) ! @rm -f gconf-sanity-check-2$(EXEEXT) ! $(LINK) $(gconf_sanity_check_2_LDFLAGS) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS) ! gconfd-2$(EXEEXT): $(gconfd_2_OBJECTS) $(gconfd_2_DEPENDENCIES) ! @rm -f gconfd-2$(EXEEXT) ! $(LINK) $(gconfd_2_LDFLAGS) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS) ! gconftool-2$(EXEEXT): $(gconftool_2_OBJECTS) $(gconftool_2_DEPENDENCIES) @rm -f gconftool-2$(EXEEXT) $(LINK) $(gconftool_2_LDFLAGS) $(gconftool_2_OBJECTS) $(gconftool_2_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 `cygpath -w $<` + + .c.lo: + $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + uninstall-info-am: install-gconfincludeHEADERS: $(gconfinclude_HEADERS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(gconfincludedir) @list='$(gconfinclude_HEADERS)'; for p in $$list; do \ ! if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(gconfincludedir)/$$f"; \ ! $(INSTALL_HEADER) $$d$$p $(DESTDIR)$(gconfincludedir)/$$f; \ done uninstall-gconfincludeHEADERS: @$(NORMAL_UNINSTALL) ! @list='$(gconfinclude_HEADERS)'; for p in $$list; do \ ! f="`echo $$p | sed -e 's|^.*/||'`"; \ ! echo " rm -f $(DESTDIR)$(gconfincludedir)/$$f"; \ ! rm -f $(DESTDIR)$(gconfincludedir)/$$f; \ done tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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 $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || 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 $(LTLIBRARIES) $(PROGRAMS) $(HEADERS) ! install-binPROGRAMS: install-libLTLIBRARIES ! installdirs: ! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(libexecdir) $(DESTDIR)$(gconfincludedir) ! 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)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* 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-libLTLIBRARIES \ ! clean-libexecPROGRAMS 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-data-local install-gconfincludeHEADERS ! ! install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \ ! install-libexecPROGRAMS ! ! 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 ! ! uninstall-am: uninstall-binPROGRAMS uninstall-gconfincludeHEADERS \ ! uninstall-info-am uninstall-libLTLIBRARIES \ ! uninstall-libexecPROGRAMS ! ! .PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \ ! clean-libtool 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-data-local install-exec install-exec-am \ ! install-gconfincludeHEADERS install-info install-info-am \ ! install-libLTLIBRARIES install-libexecPROGRAMS install-man \ ! install-strip installcheck installcheck-am installdirs \ ! maintainer-clean maintainer-clean-generic mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ ! tags uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-gconfincludeHEADERS uninstall-info-am \ ! uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS $(libgconf_2_la_OBJECTS) $(gconftool_2_OBJECTS) $(gconfd_2_OBJECTS): $(built_sourcecode) *************** *** 638,644 **** regenerate-built-sources: GCONF_SRCDIR=$(srcdir) $(srcdir)/regenerate-enum-header.sh $(gconf_headers) GCONF_SRCDIR=$(srcdir) $(srcdir)/regenerate-enum-footer.sh $(gconf_headers) - # 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: --- 619,624 ---- diff -crN ./GConf/install-sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/install-sh *** ./GConf/install-sh Sun Sep 8 06:13:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/install-sh Sat Aug 9 21:09:13 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 ./GConf/ltmain.sh /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/ltmain.sh *** ./GConf/ltmain.sh Tue Jan 21 04:29:18 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/ltmain.sh Sat Aug 9 21:08:51 2003 *************** *** 49,62 **** fi # 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." --- 49,62 ---- 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." *************** *** 67,85 **** # 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. *************** *** 153,159 **** ;; --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 ;; *************** *** 186,193 **** --mode) prevopt="--mode" prev=mode ;; --mode=*) mode="$optarg" ;; - --preserve-dup-deps) duplicate_deps="yes" ;; - --quiet | --silent) show=: ;; --- 177,182 ---- *************** *** 226,232 **** # 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 *************** *** 478,484 **** 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 *************** *** 768,774 **** linker_flags= dllsearchpath= lib_search_path=`pwd` - inst_prefix_dir= avoid_version=no dlfiles= --- 757,762 ---- *************** *** 899,909 **** prev= continue ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; release) release="-$arg" prev= --- 887,892 ---- *************** *** 1005,1020 **** 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" ;; *************** *** 1065,1078 **** # 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 ;; *************** *** 1352,1362 **** # 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= *************** *** 1485,1496 **** 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" *************** *** 1534,1540 **** 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 *************** *** 1581,1591 **** 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 *************** *** 1708,1718 **** # 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 *************** *** 1796,1803 **** # 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 : *************** *** 1904,1919 **** 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 *************** *** 1923,1938 **** 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 *************** *** 1974,1987 **** # 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" *************** *** 2030,2040 **** 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 *************** *** 2060,2066 **** 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 *************** *** 2324,2344 **** 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 `.'. *************** *** 2352,2358 **** ;; 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" *************** *** 2444,2452 **** # 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 *************** *** 2497,2503 **** *-*-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. ;; *) *************** *** 2558,2577 **** 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. *************** *** 2590,2601 **** 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 *************** *** 2634,2647 **** # 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="" *************** *** 2652,2668 **** 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. *************** *** 2681,2689 **** 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="" *************** *** 2694,2710 **** 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. *************** *** 2969,2986 **** 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 ---- *************** *** 3179,3185 **** 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 *************** *** 3201,3216 **** # 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" *************** *** 3374,3382 **** 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 *************** *** 3384,3390 **** 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 *************** *** 3399,3411 **** 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 *************** *** 3627,3633 **** 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 *************** *** 3647,3653 **** # 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 *************** *** 3671,3677 **** # 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 *************** *** 3709,3715 **** 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%/[^/]*\$%%'\` *************** *** 3722,3728 **** 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. *************** *** 3736,3742 **** 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\" *************** *** 3782,3788 **** $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 *************** *** 3957,3963 **** 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. *************** *** 3974,3980 **** 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 *************** *** 3988,3994 **** 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 *************** *** 3999,4005 **** 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 *************** *** 4013,4018 **** --- 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 *************** *** 4223,4229 **** *.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 *************** *** 4257,4289 **** 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 *************** *** 4293,4299 **** 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" *************** *** 4390,4416 **** 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 *************** *** 4435,4442 **** 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= *************** *** 4444,4454 **** if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" ! tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` ! if test $? = 0 ; then : ! 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 *************** *** 4488,4494 **** 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 ;; *************** *** 4636,4642 **** 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 *************** *** 4707,4713 **** -*) ;; *) # 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 ;; *************** *** 4739,4745 **** 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 *************** *** 4816,4822 **** 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. *************** *** 4871,4877 **** *) # 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 ./GConf/missing /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/missing *** ./GConf/missing Sun Sep 8 06:13:12 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/missing Sat Aug 9 21:09:13 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 1996, 1997, 1999, 2000 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.3 - GNU automake" ;; -*) *************** *** 66,75 **** exit 1 ;; ! 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 --- 87,96 ---- exit 1 ;; ! 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 *************** *** 78,84 **** 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 --- 99,105 ---- 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 *************** *** 87,96 **** 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 --- 108,117 ---- 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 *************** *** 103,112 **** touch $touch_files ;; ! 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 | --- 124,133 ---- touch $touch_files ;; ! 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 | *************** *** 167,173 **** --- 188,219 ---- fi ;; + help2man) + 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 **** --- 229,273 ---- 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 ${1+"$@"} && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar ${1+"$@"} && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" ${1+"$@"} && 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 ./GConf/stamp-h.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/stamp-h.in *** ./GConf/stamp-h.in Tue Jan 21 04:30:16 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/stamp-h.in Sat Aug 9 21:09:13 2003 *************** *** 1 **** - timestamp --- 0 ---- diff -crN ./GConf/tests/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/tests/Makefile.in *** ./GConf/tests/Makefile.in Tue Jan 21 04:30:17 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./GConf/tests/Makefile.in Sat Aug 9 21:09:18 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,7 ---- ! # Makefile.in generated automatically by automake 1.5 from Makefile.am. ! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 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. *************** *** 10,15 **** --- 11,17 ---- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. + @SET_MAKE@ SHELL = @SHELL@ *************** *** 31,43 **** mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - - DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = .. ACLOCAL = @ACLOCAL@ --- 33,41 ---- *************** *** 46,56 **** 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 = : --- 44,54 ---- AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ ! INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : *************** *** 59,64 **** --- 57,63 ---- POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ + AMTAR = @AMTAR@ AS = @AS@ AWK = @AWK@ BDB_CFLAGS = @BDB_CFLAGS@ *************** *** 72,77 **** --- 71,77 ---- CXX = @CXX@ DATADIRNAME = @DATADIRNAME@ DB2HTML = @DB2HTML@ + DEPDIR = @DEPDIR@ DEPENDENT_CFLAGS = @DEPENDENT_CFLAGS@ DEPENDENT_LIBS = @DEPENDENT_LIBS@ DEPENDENT_WITH_GTK_CFLAGS = @DEPENDENT_WITH_GTK_CFLAGS@ *************** *** 100,105 **** --- 100,106 ---- INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ INDENT = @INDENT@ INSTALL_GCONF_CONFIG_SOURCE = @INSTALL_GCONF_CONFIG_SOURCE@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ *************** *** 109,115 **** LN_S = @LN_S@ MAINT = @MAINT@ MAJOR_VERSION = @MAJOR_VERSION@ - MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ --- 110,115 ---- *************** *** 129,140 **** USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ gconflocaledir = @gconflocaledir@ l = @l@ EFENCE = ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(DEPENDENT_CFLAGS) -DG_LOG_DOMAIN=\"GConf-Tests\" -DGCONF_ENABLE_INTERNALS=1 noinst_PROGRAMS = testgconf testlisteners testschemas testchangeset testencode testunique testpersistence testdirlist testaddress testbackend --- 129,145 ---- USE_NLS = @USE_NLS@ VERSION = @VERSION@ absolute_top_srcdir = @absolute_top_srcdir@ + am__include = @am__include@ + am__quote = @am__quote@ gconflocaledir = @gconflocaledir@ + install_sh = @install_sh@ l = @l@ EFENCE = ! INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ ! $(DEPENDENT_CFLAGS) -I$(top_builddir)/gconf \ ! -DG_LOG_DOMAIN=\"GConf-Tests\" -DGCONF_ENABLE_INTERNALS=1 noinst_PROGRAMS = testgconf testlisteners testschemas testchangeset testencode testunique testpersistence testdirlist testaddress testbackend *************** *** 180,304 **** testbackend_SOURCES = testbackend.c testbackend_LDADD = $(TESTLIBS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = ../config.h ! CONFIG_CLEAN_FILES = ! noinst_PROGRAMS = testgconf$(EXEEXT) testlisteners$(EXEEXT) \ ! testschemas$(EXEEXT) testchangeset$(EXEEXT) testencode$(EXEEXT) \ ! testunique$(EXEEXT) testpersistence$(EXEEXT) testdirlist$(EXEEXT) \ ! testaddress$(EXEEXT) testbackend$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! DEFS = @DEFS@ -I. -I$(srcdir) -I.. LIBS = @LIBS@ ! testgconf_OBJECTS = testgconf.$(OBJEXT) ! testgconf_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testgconf_LDFLAGS = ! testlisteners_OBJECTS = testlisteners.$(OBJEXT) ! testlisteners_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testlisteners_LDFLAGS = ! testschemas_OBJECTS = testschemas.$(OBJEXT) ! testschemas_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testschemas_LDFLAGS = ! testchangeset_OBJECTS = testchangeset.$(OBJEXT) ! testchangeset_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testchangeset_LDFLAGS = ! testencode_OBJECTS = testencode.$(OBJEXT) ! testencode_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testencode_LDFLAGS = ! testunique_OBJECTS = testunique.$(OBJEXT) ! testunique_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testunique_LDFLAGS = ! testpersistence_OBJECTS = testpersistence.$(OBJEXT) ! testpersistence_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testpersistence_LDFLAGS = ! testdirlist_OBJECTS = testdirlist.$(OBJEXT) ! testdirlist_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testdirlist_LDFLAGS = ! testaddress_OBJECTS = testaddress.$(OBJEXT) ! testaddress_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testaddress_LDFLAGS = ! testbackend_OBJECTS = testbackend.$(OBJEXT) ! testbackend_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testbackend_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 = $(testgconf_SOURCES) $(testlisteners_SOURCES) $(testschemas_SOURCES) $(testchangeset_SOURCES) $(testencode_SOURCES) $(testunique_SOURCES) $(testpersistence_SOURCES) $(testdirlist_SOURCES) $(testaddress_SOURCES) $(testbackend_SOURCES) - OBJECTS = $(testgconf_OBJECTS) $(testlisteners_OBJECTS) $(testschemas_OBJECTS) $(testchangeset_OBJECTS) $(testencode_OBJECTS) $(testunique_OBJECTS) $(testpersistence_OBJECTS) $(testdirlist_OBJECTS) $(testaddress_OBJECTS) $(testbackend_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 tests/Makefile ! ! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ! 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 --- 185,276 ---- testbackend_SOURCES = testbackend.c testbackend_LDADD = $(TESTLIBS) + subdir = tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ! CONFIG_HEADER = $(top_builddir)/config.h ! CONFIG_CLEAN_FILES = ! noinst_PROGRAMS = testgconf$(EXEEXT) testlisteners$(EXEEXT) \ ! testschemas$(EXEEXT) testchangeset$(EXEEXT) testencode$(EXEEXT) \ ! testunique$(EXEEXT) testpersistence$(EXEEXT) \ ! testdirlist$(EXEEXT) testaddress$(EXEEXT) testbackend$(EXEEXT) ! PROGRAMS = $(noinst_PROGRAMS) ! ! am_testaddress_OBJECTS = testaddress.$(OBJEXT) ! testaddress_OBJECTS = $(am_testaddress_OBJECTS) ! testaddress_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testaddress_LDFLAGS = ! am_testbackend_OBJECTS = testbackend.$(OBJEXT) ! testbackend_OBJECTS = $(am_testbackend_OBJECTS) ! testbackend_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testbackend_LDFLAGS = ! am_testchangeset_OBJECTS = testchangeset.$(OBJEXT) ! testchangeset_OBJECTS = $(am_testchangeset_OBJECTS) ! testchangeset_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testchangeset_LDFLAGS = ! am_testdirlist_OBJECTS = testdirlist.$(OBJEXT) ! testdirlist_OBJECTS = $(am_testdirlist_OBJECTS) ! testdirlist_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testdirlist_LDFLAGS = ! am_testencode_OBJECTS = testencode.$(OBJEXT) ! testencode_OBJECTS = $(am_testencode_OBJECTS) ! testencode_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testencode_LDFLAGS = ! am_testgconf_OBJECTS = testgconf.$(OBJEXT) ! testgconf_OBJECTS = $(am_testgconf_OBJECTS) ! testgconf_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testgconf_LDFLAGS = ! am_testlisteners_OBJECTS = testlisteners.$(OBJEXT) ! testlisteners_OBJECTS = $(am_testlisteners_OBJECTS) ! testlisteners_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testlisteners_LDFLAGS = ! am_testpersistence_OBJECTS = testpersistence.$(OBJEXT) ! testpersistence_OBJECTS = $(am_testpersistence_OBJECTS) ! testpersistence_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testpersistence_LDFLAGS = ! am_testschemas_OBJECTS = testschemas.$(OBJEXT) ! testschemas_OBJECTS = $(am_testschemas_OBJECTS) ! testschemas_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testschemas_LDFLAGS = ! am_testunique_OBJECTS = testunique.$(OBJEXT) ! testunique_OBJECTS = $(am_testunique_OBJECTS) ! testunique_DEPENDENCIES = \ ! $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la ! testunique_LDFLAGS = ! DEFS = @DEFS@ ! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) ! CPPFLAGS = @CPPFLAGS@ ! LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ ! depcomp = ! 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 = $(testaddress_SOURCES) $(testbackend_SOURCES) \ ! $(testchangeset_SOURCES) $(testdirlist_SOURCES) \ ! $(testencode_SOURCES) $(testgconf_SOURCES) \ ! $(testlisteners_SOURCES) $(testpersistence_SOURCES) \ ! $(testschemas_SOURCES) $(testunique_SOURCES) ! DIST_COMMON = Makefile.am Makefile.in ! SOURCES = $(testaddress_SOURCES) $(testbackend_SOURCES) $(testchangeset_SOURCES) $(testdirlist_SOURCES) $(testencode_SOURCES) $(testgconf_SOURCES) $(testlisteners_SOURCES) $(testpersistence_SOURCES) $(testschemas_SOURCES) $(testunique_SOURCES) ! all: all-am .SUFFIXES: ! .SUFFIXES: .c .lo .o .obj mostlyclean-libtool: -rm -f *.lo *************** *** 307,474 **** -rm -rf .libs _libs distclean-libtool: ! maintainer-clean-libtool: ! ! testgconf$(EXEEXT): $(testgconf_OBJECTS) $(testgconf_DEPENDENCIES) @rm -f testgconf$(EXEEXT) $(LINK) $(testgconf_LDFLAGS) $(testgconf_OBJECTS) $(testgconf_LDADD) $(LIBS) ! ! testlisteners$(EXEEXT): $(testlisteners_OBJECTS) $(testlisteners_DEPENDENCIES) @rm -f testlisteners$(EXEEXT) $(LINK) $(testlisteners_LDFLAGS) $(testlisteners_OBJECTS) $(testlisteners_LDADD) $(LIBS) ! ! testschemas$(EXEEXT): $(testschemas_OBJECTS) $(testschemas_DEPENDENCIES) @rm -f testschemas$(EXEEXT) $(LINK) $(testschemas_LDFLAGS) $(testschemas_OBJECTS) $(testschemas_LDADD) $(LIBS) ! ! testchangeset$(EXEEXT): $(testchangeset_OBJECTS) $(testchangeset_DEPENDENCIES) ! @rm -f testchangeset$(EXEEXT) ! $(LINK) $(testchangeset_LDFLAGS) $(testchangeset_OBJECTS) $(testchangeset_LDADD) $(LIBS) ! ! testencode$(EXEEXT): $(testencode_OBJECTS) $(testencode_DEPENDENCIES) ! @rm -f testencode$(EXEEXT) ! $(LINK) $(testencode_LDFLAGS) $(testencode_OBJECTS) $(testencode_LDADD) $(LIBS) ! ! testunique$(EXEEXT): $(testunique_OBJECTS) $(testunique_DEPENDENCIES) @rm -f testunique$(EXEEXT) $(LINK) $(testunique_LDFLAGS) $(testunique_OBJECTS) $(testunique_LDADD) $(LIBS) ! testpersistence$(EXEEXT): $(testpersistence_OBJECTS) $(testpersistence_DEPENDENCIES) ! @rm -f testpersistence$(EXEEXT) ! $(LINK) $(testpersistence_LDFLAGS) $(testpersistence_OBJECTS) $(testpersistence_LDADD) $(LIBS) ! testdirlist$(EXEEXT): $(testdirlist_OBJECTS) $(testdirlist_DEPENDENCIES) ! @rm -f testdirlist$(EXEEXT) ! $(LINK) $(testdirlist_LDFLAGS) $(testdirlist_OBJECTS) $(testdirlist_LDADD) $(LIBS) ! testaddress$(EXEEXT): $(testaddress_OBJECTS) $(testaddress_DEPENDENCIES) ! @rm -f testaddress$(EXEEXT) ! $(LINK) $(testaddress_LDFLAGS) $(testaddress_OBJECTS) $(testaddress_LDADD) $(LIBS) ! testbackend$(EXEEXT): $(testbackend_OBJECTS) $(testbackend_DEPENDENCIES) ! @rm -f testbackend$(EXEEXT) ! $(LINK) $(testbackend_LDFLAGS) $(testbackend_OBJECTS) $(testbackend_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 = tests 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 $(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 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. --- 279,473 ---- -rm -rf .libs _libs distclean-libtool: + -rm -f libtool + $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu --ignore-deps tests/Makefile + Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status ! clean-noinstPROGRAMS: ! -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) ! testaddress$(EXEEXT): $(testaddress_OBJECTS) $(testaddress_DEPENDENCIES) ! @rm -f testaddress$(EXEEXT) ! $(LINK) $(testaddress_LDFLAGS) $(testaddress_OBJECTS) $(testaddress_LDADD) $(LIBS) ! testbackend$(EXEEXT): $(testbackend_OBJECTS) $(testbackend_DEPENDENCIES) ! @rm -f testbackend$(EXEEXT) ! $(LINK) $(testbackend_LDFLAGS) $(testbackend_OBJECTS) $(testbackend_LDADD) $(LIBS) ! testchangeset$(EXEEXT): $(testchangeset_OBJECTS) $(testchangeset_DEPENDENCIES) ! @rm -f testchangeset$(EXEEXT) ! $(LINK) $(testchangeset_LDFLAGS) $(testchangeset_OBJECTS) $(testchangeset_LDADD) $(LIBS) ! testdirlist$(EXEEXT): $(testdirlist_OBJECTS) $(testdirlist_DEPENDENCIES) ! @rm -f testdirlist$(EXEEXT) ! $(LINK) $(testdirlist_LDFLAGS) $(testdirlist_OBJECTS) $(testdirlist_LDADD) $(LIBS) ! testencode$(EXEEXT): $(testencode_OBJECTS) $(testencode_DEPENDENCIES) ! @rm -f testencode$(EXEEXT) ! $(LINK) $(testencode_LDFLAGS) $(testencode_OBJECTS) $(testencode_LDADD) $(LIBS) ! testgconf$(EXEEXT): $(testgconf_OBJECTS) $(testgconf_DEPENDENCIES) @rm -f testgconf$(EXEEXT) $(LINK) $(testgconf_LDFLAGS) $(testgconf_OBJECTS) $(testgconf_LDADD) $(LIBS) ! testlisteners$(EXEEXT): $(testlisteners_OBJECTS) $(testlisteners_DEPENDENCIES) @rm -f testlisteners$(EXEEXT) $(LINK) $(testlisteners_LDFLAGS) $(testlisteners_OBJECTS) $(testlisteners_LDADD) $(LIBS) ! testpersistence$(EXEEXT): $(testpersistence_OBJECTS) $(testpersistence_DEPENDENCIES) ! @rm -f testpersistence$(EXEEXT) ! $(LINK) $(testpersistence_LDFLAGS) $(testpersistence_OBJECTS) $(testpersistence_LDADD) $(LIBS) ! testschemas$(EXEEXT): $(testschemas_OBJECTS) $(testschemas_DEPENDENCIES) @rm -f testschemas$(EXEEXT) $(LINK) $(testschemas_LDFLAGS) $(testschemas_OBJECTS) $(testschemas_LDADD) $(LIBS) ! testunique$(EXEEXT): $(testunique_OBJECTS) $(testunique_DEPENDENCIES) @rm -f testunique$(EXEEXT) $(LINK) $(testunique_LDFLAGS) $(testunique_OBJECTS) $(testunique_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 `cygpath -w $<` ! ! .c.lo: ! $(LTCOMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ! uninstall-info-am: tags: TAGS ! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) ! list='$(SOURCES) $(HEADERS) $(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 $(LISP) ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ ! $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ ! list='$(SOURCES) $(HEADERS) $(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)$$unique$(LISP)$$tags" \ ! || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) ! GTAGS: ! here=`CDPATH=: && cd $(top_builddir) && pwd` \ ! && cd $(top_srcdir) \ ! && gtags -i $(GTAGS_ARGS) $$here distclean-tags: ! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH ! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ! top_distdir = .. ! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ ! if test -f $$file; then d=.; else d=$(srcdir); fi; \ ! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ ! if test "$$dir" != "$$file" && test "$$dir" != "."; then \ ! $(mkinstalldirs) "$(distdir)/$$dir"; \ ! fi; \ if test -d $$d/$$file; then \ ! cp -pR $$d/$$file $(distdir) \ ! || 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: 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)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: ! -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* 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 ! ! uninstall-am: uninstall-info-am + .PHONY: GTAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS 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 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.