From 9a5dd5ed2464b7a8cb3ac23897b89adcb105b645 Mon Sep 17 00:00:00 2001 From: Jussi Laako Date: Thu, 13 Mar 2014 16:54:52 +0200 Subject: [PATCH] Refresh upstream 2.1.0 release Change-Id: Ief2d5f5cbdc3d9d353ca59ec4779f49441112057 --- .gitignore | 33 - ChangeLog | 12 + INSTALL | 12 +- Makefile.in | 360 +-- aclocal.m4 | 737 +++--- build-aux/ar-lib | 15 +- build-aux/compile | 99 +- build-aux/config.guess | 184 +- build-aux/config.sub | 106 +- build-aux/depcomp | 487 ++-- build-aux/install-sh | 14 +- build-aux/ltmain.sh | 4 +- build-aux/missing | 414 ++-- build-aux/py-compile | 23 +- build-aux/test-driver | 139 ++ config.h.in | 3 - configure | 1025 +++++---- dists/rpm/libgsignon-glib-tizen.spec | 11 +- docs/Makefile.in | 270 ++- docs/reference/Makefile.in | 683 ++++-- docs/reference/html/SignonAuthService.html | 166 +- docs/reference/html/SignonAuthSession.html | 461 ++-- docs/reference/html/SignonIdentity.html | 864 +++---- docs/reference/html/SignonIdentityInfo.html | 442 ++-- docs/reference/html/SignonSecurityContext.html | 368 +-- docs/reference/html/api-index-deprecated.html | 4 + docs/reference/html/index.sgml | 124 +- docs/reference/html/libgsignon-glib.devhelp2 | 124 +- docs/reference/libgsignon-glib-sections.txt | 131 +- examples/Makefile.in | 200 +- gtk-doc.make | 101 +- libgsignon-glib/Makefile.am | 113 +- libgsignon-glib/Makefile.in | 366 ++- libgsignon-glib/signon-enum-types.c | 48 - libgsignon-glib/signon-errors-enum.c | 61 - libgsignon-glib/signon-errors-map.c | 43 - libgsignon-glib/signon-marshal.c | 88 - libgsignon-glib/signon-marshal.h | 20 - libgsignon-glib/sso-auth-service-gen.c | 2723 ---------------------- libgsignon-glib/sso-auth-service-gen.h | 434 ---- libgsignon-glib/sso-auth-session-gen.c | 1591 ------------- libgsignon-glib/sso-auth-session-gen.h | 250 --- libgsignon-glib/sso-identity-gen.c | 2872 ------------------------ libgsignon-glib/sso-identity-gen.h | 449 ---- m4/gtk-doc.m4 | 51 +- m4/libtool.m4 | 52 +- pygobject/Makefile.in | 119 +- tests/Makefile.in | 631 ++++-- tests/signon-glib-test.sh | 8 +- tools/prepare-tizen.sh | 15 +- 50 files changed, 5322 insertions(+), 12228 deletions(-) delete mode 100644 .gitignore create mode 100755 build-aux/test-driver delete mode 100644 libgsignon-glib/signon-enum-types.c delete mode 100644 libgsignon-glib/signon-errors-enum.c delete mode 100644 libgsignon-glib/signon-errors-map.c delete mode 100644 libgsignon-glib/signon-marshal.c delete mode 100644 libgsignon-glib/signon-marshal.h delete mode 100644 libgsignon-glib/sso-auth-service-gen.c delete mode 100644 libgsignon-glib/sso-auth-service-gen.h delete mode 100644 libgsignon-glib/sso-auth-session-gen.c delete mode 100644 libgsignon-glib/sso-auth-session-gen.h delete mode 100644 libgsignon-glib/sso-identity-gen.c delete mode 100644 libgsignon-glib/sso-identity-gen.h diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 193db2d..0000000 --- a/.gitignore +++ /dev/null @@ -1,33 +0,0 @@ -.deps/ -.libs/ -.*.swp -Makefile -Makefile.in -aclocal.m4 -/build-aux/ -configure -config.* -/docs/reference/html/ -/docs/reference/libgsignon-glib* -/docs/reference/libgsignon-glib-sections.txt -/docs/reference/version.xml -/docs/reference/xml/ -gtk-doc.make -examples/gsso-example -/INSTALL -libtool -m4/gtk-doc.m4 -m4/libtool.m4 -m4/lt*.m4 -patches/ -stamp-h1 -*~ -*.cache -*.gir -*.la -*.lo -*.o -*.pc -*.stamp -*.typelib -*.tar.* diff --git a/ChangeLog b/ChangeLog index 08702b2..1bb4e65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2014-03-12 Jussi Laako + +tizen: update package group + +2014-03-11 Jussi Laako + +tizen: fix build and release script + +2014-03-07 Imran Zaman + +fixed tizen prepare script for packaging folder + 2014-03-06 Jussi Laako Release 2.1.0 diff --git a/INSTALL b/INSTALL index a1e89e1..2099840 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Installation Instructions ************************* -Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -309,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -367,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/Makefile.in b/Makefile.in index 9ba69a8..4508876 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,13 +81,20 @@ host_triplet = @host@ @ENABLE_PYTHON_TRUE@am__append_1 = pygobject @ENABLE_TESTS_TRUE@am__append_2 = tests subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_noinst_DATA) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in $(srcdir)/libgsignon-glib.pc.in \ - $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - build-aux/ar-lib build-aux/compile build-aux/config.guess \ - build-aux/config.sub build-aux/depcomp build-aux/install-sh \ - build-aux/ltmain.sh build-aux/missing build-aux/py-compile + $(dist_noinst_DATA) COPYING build-aux/ar-lib build-aux/compile \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/missing build-aux/py-compile \ + build-aux/ltmain.sh $(top_srcdir)/build-aux/ar-lib \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -58,21 +109,33 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = libgsignon-glib.pc CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -104,11 +167,33 @@ am__installdirs = "$(DESTDIR)$(pkgconfigdir)" DATA = $(dist_noinst_DATA) $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = libgsignon-glib docs examples pygobject tests DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -119,6 +204,7 @@ am__remove_distdir = \ && rm -rf "$(distdir)" \ || { sleep 5 && rm -rf "$(distdir)"; }; \ else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -146,6 +232,7 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -181,6 +268,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -355,8 +443,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -381,8 +469,11 @@ distclean-libtool: -rm -f libtool config.lt install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -399,22 +490,25 @@ uninstall-pkgconfigDATA: dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (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): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (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. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -429,57 +523,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - 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"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -495,12 +544,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -512,15 +556,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -529,9 +569,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -567,13 +629,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -605,40 +664,42 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + $(am__post_remove_distdir) dist-lzip: distdir tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz - $(am__remove_distdir) - -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) + $(am__post_remove_distdir) dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -649,8 +710,6 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.lz*) \ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ @@ -662,18 +721,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -696,7 +756,7 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' @@ -835,25 +895,25 @@ ps-am: uninstall-am: uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-pkgconfigDATA +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-pkgconfigDATA dist-hook: git-changelog-hook diff --git a/aclocal.m4 b/aclocal.m4 index 1ece26a..e0dc478 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,8 +1,7 @@ -# generated automatically by aclocal 1.11.3 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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. @@ -12,13 +11,14 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- # serial 1 (pkg-config-0.24) @@ -180,25 +180,22 @@ else fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 2002-2013 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. -# serial 1 - # 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. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.3], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -214,19 +211,17 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.3])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2011-2013 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. -# serial 1 - # AM_PROG_AR([ACT-IF-FAIL]) # ------------------------- # Try to determine the archiver interface, and trigger the ar-lib wrapper @@ -241,7 +236,8 @@ AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false]) : ${AR=ar} AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], - [am_cv_ar_interface=ar + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([am_ar_try]) @@ -258,7 +254,7 @@ AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], fi rm -f conftest.lib libconftest.a ]) - ]) + AC_LANG_POP([C])]) case $am_cv_ar_interface in ar) @@ -282,17 +278,15 @@ AC_SUBST([AR])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 1 - # 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/../..'. +# $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 @@ -311,7 +305,7 @@ AC_SUBST([AR])dnl # # 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 +# 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, @@ -337,22 +331,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -371,16 +362,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, -# 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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. -# serial 12 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# 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 @@ -390,7 +379,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # 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 @@ -403,12 +392,13 @@ 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], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$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], @@ -416,8 +406,8 @@ AC_CACHE_CHECK([dependency style of $depcc], # 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'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -457,16 +447,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -475,8 +465,8 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # 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 @@ -484,7 +474,7 @@ AC_CACHE_CHECK([dependency style of $depcc], fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -532,7 +522,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -542,9 +532,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -559,20 +553,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -585,7 +577,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -597,21 +589,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. 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 " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -629,7 +619,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -639,18 +629,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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. -# serial 16 - # 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. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -663,7 +656,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -692,31 +685,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -727,34 +729,79 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_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 + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi ]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -776,15 +823,12 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, -# Inc. +# Copyright (C) 2001-2013 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. -# serial 1 - # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -798,16 +842,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 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. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -823,14 +865,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -848,7 +888,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -873,52 +913,14 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# 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. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 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. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -926,11 +928,10 @@ AC_DEFUN([AM_MISSING_PROG], $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. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -943,54 +944,22 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006, 2011 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. - -# serial 1 - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 5 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], @@ -1000,7 +969,7 @@ AC_DEFUN([_AM_MANGLE_OPTION], # -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) # ------------------------ @@ -1014,14 +983,59 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 1999-2013 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. -# serial 2 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # --------------------------------------------------------------------------- @@ -1050,7 +1064,7 @@ AC_DEFUN([AM_PATH_PYTHON], dnl Find a Python interpreter. Python versions prior to 2.0 are not dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], -[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl +[python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 dnl python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0]) AC_ARG_VAR([PYTHON], [the Python interpreter]) @@ -1066,10 +1080,11 @@ AC_DEFUN([AM_PATH_PYTHON], dnl A version check is needed. if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - AC_MSG_CHECKING([whether $PYTHON version >= $1]) + AC_MSG_CHECKING([whether $PYTHON version is >= $1]) AM_PYTHON_CHECK_VERSION([$PYTHON], [$1], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR(too old)]) + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([Python interpreter is too old])]) am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies @@ -1118,6 +1133,25 @@ AC_DEFUN([AM_PATH_PYTHON], [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[[:3]] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" dnl Set up 4 directories: @@ -1134,7 +1168,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -1169,7 +1210,14 @@ AC_DEFUN([AM_PATH_PYTHON], else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -1217,14 +1265,12 @@ for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 1 - # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1238,22 +1284,16 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996-2013 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. -# serial 5 - # 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 # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -1264,32 +1304,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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 - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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 + 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 + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -1299,31 +1347,50 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 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. -# serial 2 - # AM_SILENT_RULES([DEFAULT]) # -------------------------- # Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). +# ("yes" being less verbose, "no" or empty being verbose). AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; esac dnl -dnl A few `make' implementations (e.g., NonStop OS and NextStep) +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) dnl do not support nested variable expansions. dnl See automake bug#9928 and bug#10237. am_make=${MAKE-make} @@ -1341,7 +1408,7 @@ else am_cv_make_support_nested_variables=no fi]) if test $am_cv_make_support_nested_variables = yes; then - dnl Using `$V' instead of `$(V)' breaks IRIX make. + dnl Using '$V' instead of '$(V)' breaks IRIX make. AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' else @@ -1358,44 +1425,40 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 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. -# serial 1 - # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# 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 +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 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. -# serial 3 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -1409,18 +1472,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 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. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -1430,76 +1491,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/build-aux/ar-lib b/build-aux/ar-lib index c0286a4..fe2301e 100755 --- a/build-aux/ar-lib +++ b/build-aux/ar-lib @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-01-30.22; # UTC +scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010, 2012 Free Software Foundation, Inc. +# Copyright (C) 2010-2013 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify @@ -153,7 +153,9 @@ action=${action#-} delete= extract= list= +quick= replace= +index= create= while test -n "$action" @@ -162,7 +164,10 @@ do d*) delete=yes ;; x*) extract=yes ;; t*) list=yes ;; + q*) quick=yes ;; r*) replace=yes ;; + s*) index=yes ;; + S*) ;; # the index is always updated implicitly c*) create=yes ;; u*) ;; # TODO: don't ignore the update modifier v*) ;; # TODO: don't ignore the verbose modifier @@ -173,8 +178,8 @@ do action=${action#?} done -case $delete$extract$list$replace in - yes) +case $delete$extract$list$quick$replace,$index in + yes,* | ,yes) ;; yesyes*) func_error "more than one action specified" @@ -225,7 +230,7 @@ elif test -n "$extract"; then done fi -elif test -n "$replace"; then +elif test -n "$quick$replace"; then if test ! -f "$orig_archive"; then if test -z "$create"; then echo "$me: creating $orig_archive" diff --git a/build-aux/compile b/build-aux/compile index b1f4749..531136b 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,10 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-01-04.17; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -79,6 +78,53 @@ func_file_conv () esac } +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + # func_cl_wrapper cl arg... # Adjust compile command to suit cl func_cl_wrapper () @@ -109,43 +155,34 @@ func_cl_wrapper () ;; esac ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; -I*) func_file_conv "${1#-I}" mingw set x "$@" -I"$file" shift ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; -l*) - lib=${1#-l} - found=no - save_IFS=$IFS - IFS=';' - for dir in $lib_path $LIB - do - IFS=$save_IFS - if $shared && test -f "$dir/$lib.dll.lib"; then - found=yes - set x "$@" "$dir/$lib.dll.lib" - break - fi - if test -f "$dir/$lib.lib"; then - found=yes - set x "$@" "$dir/$lib.lib" - break - fi - done - IFS=$save_IFS - - test "$found" != yes && set x "$@" "$lib.lib" + func_cl_dashl "${1#-l}" + set x "$@" "$lib" shift ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; -L*) - func_file_conv "${1#-L}" - if test -z "$lib_path"; then - lib_path=$file - else - lib_path="$lib_path;$file" - fi - linker_opts="$linker_opts -LIBPATH:$file" + func_cl_dashL "${1#-L}" ;; -static) shared=false diff --git a/build-aux/config.guess b/build-aux/config.guess index d622a44..b79252d 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2012-02-10' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -22,19 +20,17 @@ timestamp='2012-02-10' # 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. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -54,9 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -801,6 +820,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -852,21 +874,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -879,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -950,54 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1201,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1227,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1256,7 +1287,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1330,9 +1361,6 @@ EOF exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c <. @@ -26,11 +20,12 @@ timestamp='2012-02-10' # 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. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -73,9 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,7 +116,7 @@ esac maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) @@ -156,7 +149,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; @@ -225,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -253,10 +252,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | be32 | be64 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -267,7 +268,7 @@ case $basic_machine in | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -285,16 +286,17 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 \ - | or32 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -364,13 +366,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -383,7 +385,8 @@ case $basic_machine in | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -401,12 +404,13 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -782,11 +786,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1013,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1340,21 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-android* \ - | -linux-newlib* | -linux-uclibc* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1486,9 +1498,6 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; @@ -1537,6 +1546,12 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; tic54x-*) os=-coff ;; @@ -1577,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; diff --git a/build-aux/depcomp b/build-aux/depcomp index bd0ac08..4ebd5b3 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2011-12-04.11; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 @@ -28,9 +27,9 @@ scriptversion=2011-12-04.11; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,8 +39,8 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. tmpdepfile Temporary file to use when outputting dependencies. @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,26 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp fi if test "$depmode" = msvc7msys; then - # This is just like msvc7 but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u='sed s,\\\\,/,g' - depmode=msvc7 + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -122,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -131,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -145,33 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as ## well. hp depmode also adds that space, but also prefixes the VPATH ## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ - | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -189,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -198,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -247,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -258,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -307,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -319,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -332,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -343,77 +461,61 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; msvc7) if test "$libtool" = yes; then @@ -424,8 +526,7 @@ msvc7) "$@" $showIncludes > "$tmpdepfile" stat=$? grep -v '^Note: including file: ' "$tmpdepfile" - if test "$stat" = 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -443,14 +544,15 @@ msvc7) p }' | $cygpath_u | sort -u | sed -n ' s/ /\\ /g -s/\(.*\)/ \1 \\/p +s/\(.*\)/'"$tab"'\1 \\/p s/.\(.*\) \\/\1:/ H $ { - s/.*/ / + s/.*/'"$tab"'/ G p }' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash rm -f "$tmpdepfile" ;; @@ -478,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -498,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -562,11 +664,12 @@ makedepend) # makedepend may prepend the VPATH from the source file name to the object. # No need to regex-escape $object, excess matching of '.' is harmless. sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -583,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -602,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -637,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/build-aux/install-sh b/build-aux/install-sh index a9244eb..377bb86 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-01-19.21; # UTC +scriptversion=2011-11-20.07; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -35,7 +35,7 @@ scriptversion=2011-01-19.21; # UTC # FSF changes to this file are in the public domain. # # Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it +# 'make' implicit rules from creating a file called install from it # when there is no Makefile. # # This script is compatible with the BSD install script, but was written @@ -156,7 +156,7 @@ while test $# -ne 0; do -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -190,7 +190,7 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then fi shift # arg dst_arg=$arg - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $dst_arg in -* | [=\(\)!]) dst_arg=./$dst_arg;; esac @@ -202,7 +202,7 @@ if test $# -eq 0; then echo "$0: no input file specified." >&2 exit 1 fi - # It's OK to call `install-sh -d' without argument. + # It's OK to call 'install-sh -d' without argument. # This can happen when creating conditional directories. exit 0 fi @@ -240,7 +240,7 @@ fi for src do - # Protect names problematic for `test' and other utilities. + # Protect names problematic for 'test' and other utilities. case $src in -* | [=\(\)!]) src=./$src;; esac @@ -354,7 +354,7 @@ do if test -z "$dir_arg" || { # Check for POSIX incompatibilities with -m. # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. + # other-writable bit of parent directory when it shouldn't. # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. ls_ld_tmpdir=`ls -ld "$tmpdir"` case $ls_ld_tmpdir in diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index c2852d8..bb5fa02 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -70,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.7 # automake: $automake_version # autoconf: $autoconf_version # @@ -80,7 +80,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.2 Debian-2.4.2-1ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1.7" TIMESTAMP="" package_revision=1.3337 diff --git a/build-aux/missing b/build-aux/missing index 86a8fc3..db98974 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,11 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.13; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written 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 @@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC # 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" + echo 1>&2 "Try '$0 --help' for more information" exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# 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 -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. 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' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - 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 - yacc create \`y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. +Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and +'g' are ignored when checking the name. Send bug reports to ." exit $? @@ -99,228 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" + echo 1>&2 "$0: unknown '$1' option" + echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. 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 - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. 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 | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. 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 "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'autom4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; -esac - -exit 0 + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/build-aux/py-compile b/build-aux/py-compile index 15c834c..46ea866 100755 --- a/build-aux/py-compile +++ b/build-aux/py-compile @@ -3,8 +3,7 @@ scriptversion=2011-06-08.12; # UTC -# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009, 2011 Free -# Software Foundation, Inc. +# Copyright (C) 2000-2013 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 @@ -37,7 +36,7 @@ me=py-compile usage_error () { echo "$me: $*" >&2 - echo "Try \`$me --help' for more information." >&2 + echo "Try '$me --help' for more information." >&2 exit 1 } @@ -117,7 +116,7 @@ else fi $PYTHON -c " -import sys, os, py_compile +import sys, os, py_compile, imp files = '''$files''' @@ -130,12 +129,19 @@ for file in files.split(): continue sys.stdout.write(file) sys.stdout.flush() - py_compile.compile(filepath, filepath + 'c', path) + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath), path) + else: + py_compile.compile(filepath, filepath + 'c', path) sys.stdout.write('\n')" || exit $? # this will fail for python < 1.5, but that doesn't matter ... $PYTHON -O -c " -import sys, os, py_compile +import sys, os, py_compile, imp + +# pypy does not use .pyo optimization +if hasattr(sys, 'pypy_translation_info'): + sys.exit(0) files = '''$files''' sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') @@ -147,7 +153,10 @@ for file in files.split(): continue sys.stdout.write(file) sys.stdout.flush() - py_compile.compile(filepath, filepath + 'o', path) + if hasattr(imp, 'get_tag'): + py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) + else: + py_compile.compile(filepath, filepath + 'o', path) sys.stdout.write('\n')" 2>/dev/null || : # Local Variables: diff --git a/build-aux/test-driver b/build-aux/test-driver new file mode 100755 index 0000000..d306056 --- /dev/null +++ b/build-aux/test-driver @@ -0,0 +1,139 @@ +#! /bin/sh +# test-driver - basic testsuite driver script. + +scriptversion=2013-07-13.22; # UTC + +# Copyright (C) 2011-2013 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, see . + +# 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. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +# Make unconditional expansion of undefined variables an error. This +# helps a lot in preventing typo-related bugs. +set -u + +usage_error () +{ + echo "$0: $*" >&2 + print_usage >&2 + exit 2 +} + +print_usage () +{ + cat <$log_file 2>&1 +estatus=$? +if test $enable_hard_errors = no && test $estatus -eq 99; then + estatus=1 +fi + +case $estatus:$expect_failure in + 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; + 0:*) col=$grn res=PASS recheck=no gcopy=no;; + 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; + 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;; + *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;; + *:*) col=$red res=FAIL recheck=yes gcopy=yes;; +esac + +# Report outcome to console. +echo "${col}${res}${std}: $test_name" + +# Register the test result, and other relevant metadata. +echo ":test-result: $res" > $trs_file +echo ":global-test-result: $res" >> $trs_file +echo ":recheck: $recheck" >> $trs_file +echo ":copy-in-global-log: $gcopy" >> $trs_file + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/config.h.in b/config.h.in index ce79c6e..a0a213d 100644 --- a/config.h.in +++ b/config.h.in @@ -37,9 +37,6 @@ */ #undef LT_OBJDIR -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff --git a/configure b/configure index 9e6bb61..650d382 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libgsignon-glib 2.1.0. +# Generated by GNU Autoconf 2.69 for libgsignon-glib 2.1.0. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -639,11 +659,14 @@ GTK_DOC_BUILD_HTML_FALSE GTK_DOC_BUILD_HTML_TRUE ENABLE_GTK_DOC_FALSE ENABLE_GTK_DOC_TRUE +HAVE_GTK_DOC_FALSE +HAVE_GTK_DOC_TRUE GTKDOC_DEPS_LIBS GTKDOC_DEPS_CFLAGS HTML_DIR GTKDOC_MKPDF GTKDOC_REBASE +GTKDOC_CHECK_PATH GTKDOC_CHECK ENABLE_TESTS_FALSE ENABLE_TESTS_TRUE @@ -1282,8 +1305,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1447,10 +1468,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0') - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] @@ -1580,9 +1603,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF libgsignon-glib configure 2.1.0 -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1658,7 +1681,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1858,7 +1881,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by libgsignon-glib $as_me 2.1.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2240,7 +2263,7 @@ ac_config_headers="$ac_config_headers config.h" -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2279,7 +2302,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2337,9 +2360,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2350,32 +2370,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# 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 - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + 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 + 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 + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -2387,6 +2415,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2409,12 +2447,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2426,10 +2464,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -2448,7 +2486,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2488,7 +2526,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2539,7 +2577,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2568,12 +2606,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - 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. @@ -2592,7 +2624,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2661,10 +2693,10 @@ if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; fi -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=1;; +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; esac am_make=${MAKE-make} { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 @@ -2745,6 +2777,12 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used @@ -2752,86 +2790,94 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 -$as_echo_n "checking how to create a pax tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar pax cpio none' -_am_tools=${am_cv_prog_tar_pax-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5 +$as_echo_n "checking how to create a pax tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_pax-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=posix -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=posix -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x pax -w "$$tardir"' - am__tar_='pax -L -x pax -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H pax -L' - am__tar_='find "$tardir" -print | cpio -o -H pax -L' - am__untar='cpio -i -H pax -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac + done + am__tar="$_am_tar --format=posix -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=posix -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x pax -w "$$tardir"' + am__tar_='pax -L -x pax -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H pax -L' + am__tar_='find "$tardir" -print | cpio -o -H pax -L' + am__untar='cpio -i -H pax -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_pax}" && break + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_pax}" && break - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_pax+:} false; then : + if ${am_cv_prog_tar_pax+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_pax=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5 $as_echo "$am_cv_prog_tar_pax" >&6; } @@ -2839,6 +2885,49 @@ $as_echo "$am_cv_prog_tar_pax" >&6; } +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2861,7 +2950,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2901,7 +2990,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2954,7 +3043,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2995,7 +3084,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -3053,7 +3142,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3097,7 +3186,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3543,8 +3632,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* 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); @@ -3628,6 +3716,65 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3647,7 +3794,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -3703,8 +3850,8 @@ else # 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'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're @@ -3739,16 +3886,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # 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. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3757,8 +3904,8 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # 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 @@ -3766,7 +3913,7 @@ else fi ;; msvc7 | msvc7msys | msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3970,7 +4117,7 @@ main () return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -4010,8 +4157,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* 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); @@ -4113,131 +4259,6 @@ $as_echo "none needed" >&6; } ;; #( $as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; esac -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - if test -n "$ac_tool_prefix"; then @@ -4259,7 +4280,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4303,7 +4324,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4347,7 +4368,13 @@ $as_echo_n "checking the archiver ($AR) interface... " >&6; } if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_ar_interface=ar + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; @@ -4378,6 +4405,11 @@ if ac_fn_c_try_compile "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -4593,7 +4625,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -4669,7 +4701,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4735,7 +4767,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -4802,7 +4834,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5058,7 +5090,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5102,7 +5134,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5291,7 +5323,8 @@ else ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -5526,7 +5559,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5566,7 +5599,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5692,10 +5725,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5734,7 +5763,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5872,7 +5901,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5912,7 +5941,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6015,7 +6044,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6059,7 +6088,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6184,7 +6213,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6224,7 +6253,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6283,7 +6312,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6323,7 +6352,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6815,7 +6844,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -6831,9 +6860,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -6852,7 +6891,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -6972,7 +7014,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7012,7 +7054,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7092,7 +7134,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7132,7 +7174,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7184,7 +7226,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7224,7 +7266,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7276,7 +7318,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7316,7 +7358,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7368,7 +7410,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7408,7 +7450,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7460,7 +7502,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7500,7 +7542,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8659,7 +8701,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -10829,17 +10871,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -10956,7 +10987,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -12031,7 +12062,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12074,7 +12105,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12606,16 +12637,78 @@ fi - # Extract the first word of "gtkdoc-check", so it can be a program name with args. + gtk_doc_requires="gtk-doc >= 1.14" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 +$as_echo_n "checking for gtk-doc... " >&6; } + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + have_gtk_doc=yes +else + have_gtk_doc=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5 +$as_echo "$have_gtk_doc" >&6; } + + if test "$have_gtk_doc" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&5 +$as_echo "$as_me: WARNING: + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found." >&2;} + fi + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. +set dummy gtkdoc-check; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_GTKDOC_CHECK+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$GTKDOC_CHECK"; then + ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # 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_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK +if test -n "$GTKDOC_CHECK"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 +$as_echo "$GTKDOC_CHECK" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + # Extract the first word of "gtkdoc-check", so it can be a program name with args. set dummy gtkdoc-check; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTKDOC_CHECK+:} false; then : +if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then : $as_echo_n "(cached) " >&6 else - case $GTKDOC_CHECK in + case $GTKDOC_CHECK_PATH in [\\/]* | ?:[\\/]*) - ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path. + ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -12624,8 +12717,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -12636,10 +12729,10 @@ IFS=$as_save_IFS ;; esac fi -GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK -if test -n "$GTKDOC_CHECK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5 -$as_echo "$GTKDOC_CHECK" >&6; } +GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH +if test -n "$GTKDOC_CHECK_PATH"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5 +$as_echo "$GTKDOC_CHECK_PATH" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -12666,7 +12759,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12710,7 +12803,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -12752,18 +12845,19 @@ else fi - if test x$enable_gtk_doc = xyes; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.14\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.14") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - : -else - as_fn_error $? "You need to have gtk-doc >= 1.14 installed to build $PACKAGE_NAME" "$LINENO" 5 -fi - if test "x$PACKAGE_NAME" != "xglib"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 +$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 +$as_echo "$enable_gtk_doc" >&6; } + + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + as_fn_error $? " + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5 + fi + + if test "x$PACKAGE_NAME" != "xglib"; then pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5 @@ -12823,31 +12917,11 @@ fi # Put the nasty error message in config.log where it belongs echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: - -$GTKDOC_DEPS_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + : elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } + : else GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS @@ -12855,14 +12929,8 @@ else $as_echo "yes" >&6; } fi - fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5 -$as_echo_n "checking whether to build gtk-doc documentation... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5 -$as_echo "$enable_gtk_doc" >&6; } - # Check whether --enable-gtk-doc-html was given. if test "${enable_gtk_doc_html+set}" = set; then : enableval=$enable_gtk_doc_html; @@ -12882,6 +12950,18 @@ fi enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + + + if test x$have_gtk_doc = xyes; then + HAVE_GTK_DOC_TRUE= + HAVE_GTK_DOC_FALSE='#' +else + HAVE_GTK_DOC_TRUE='#' + HAVE_GTK_DOC_FALSE= +fi if test x$enable_gtk_doc = xyes; then ENABLE_GTK_DOC_TRUE= @@ -13002,7 +13082,7 @@ if test "x$have_python" = "xyes"; then : # Find any Python interpreter. if test -z "$PYTHON"; then - for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + for ac_prog in python python2 python3 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -13022,7 +13102,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -13088,6 +13168,25 @@ $as_echo "$am_cv_python_platform" >&6; } PYTHON_PLATFORM=$am_cv_python_platform + # Just factor out some code duplication. + am_python_setup_sysconfig="\ +import sys +# Prefer sysconfig over distutils.sysconfig, for better compatibility +# with python 3.x. See automake bug#10227. +try: + import sysconfig +except ImportError: + can_use_sysconfig = 0 +else: + can_use_sysconfig = 1 +# Can't use sysconfig in CPython 2.7, since it's broken in virtualenvs: +# +try: + from platform import python_implementation + if python_implementation() == 'CPython' and sys.version[:3] == '2.7': + can_use_sysconfig = 0 +except ImportError: + pass" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 @@ -13101,7 +13200,14 @@ else else am_py_prefix=$prefix fi - am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null` + am_cv_python_pythondir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pythondir in $am_py_prefix*) am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` @@ -13138,7 +13244,14 @@ else else am_py_exec_prefix=$exec_prefix fi - am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null` + am_cv_python_pyexecdir=`$PYTHON -c " +$am_python_setup_sysconfig +if can_use_sysconfig: + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) +else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') +sys.stdout.write(sitedir)"` case $am_cv_python_pyexecdir in $am_py_exec_prefix*) am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` @@ -13292,6 +13405,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -13320,6 +13441,10 @@ if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -13642,16 +13767,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -13711,28 +13836,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -13754,7 +13867,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by libgsignon-glib $as_me 2.1.0, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -13821,10 +13934,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ libgsignon-glib config.status 2.1.0 -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -13915,7 +14028,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -14834,7 +14947,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -14847,7 +14960,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -14881,21 +14994,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. 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 " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || diff --git a/dists/rpm/libgsignon-glib-tizen.spec b/dists/rpm/libgsignon-glib-tizen.spec index 1d48218..5645423 100644 --- a/dists/rpm/libgsignon-glib-tizen.spec +++ b/dists/rpm/libgsignon-glib-tizen.spec @@ -4,8 +4,8 @@ Name: libgsignon-glib Summary: GLib API for the SSO framework Version: 2.1.0 -Release: 1 -Group: System/Libraries +Release: 2 +Group: Security/Accounts License: LGPL-2.1 Source: %{name}-%{version}.tar.gz URL: https://01.org/gsso @@ -17,7 +17,6 @@ BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gio-2.0) -BuildRequires: gobject-introspection %description %{summary}. @@ -34,12 +33,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{version} -if [ -f = "gtk-doc.make" ] -then -rm gtk-doc.make -fi -touch gtk-doc.make -autoreconf -f -i %build diff --git a/docs/Makefile.in b/docs/Makefile.in index 4f8b5d0..95d6bc0 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,7 +78,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -47,26 +91,58 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -127,6 +203,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -285,22 +362,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (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): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (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. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -315,57 +395,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - 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"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -381,12 +416,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -398,15 +428,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -415,6 +441,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -451,13 +492,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -578,22 +616,20 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/docs/reference/Makefile.in b/docs/reference/Makefile.in index 4adcb65..07e5f42 100644 --- a/docs/reference/Makefile.in +++ b/docs/reference/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -21,6 +20,51 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +83,9 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/version.xml.in $(top_srcdir)/gtk-doc.make +DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am $(srcdir)/version.xml.in \ + $(top_srcdir)/build-aux/test-driver subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -54,16 +99,228 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version.xml CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -96,6 +353,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -332,11 +590,42 @@ REPORT_FILES = \ $(DOC_MODULE)-unused.txt CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ - $(DOC_MODULE)-*.txt $(DOC_MODULE).types -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = -@ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + gtkdoc-check.test $(DOC_MODULE)-*.txt $(DOC_MODULE).types +@GTK_DOC_BUILD_HTML_FALSE@HTML_BUILD_STAMP = +@GTK_DOC_BUILD_HTML_TRUE@HTML_BUILD_STAMP = html-build.stamp +@GTK_DOC_BUILD_PDF_FALSE@PDF_BUILD_STAMP = +@GTK_DOC_BUILD_PDF_TRUE@PDF_BUILD_STAMP = pdf-build.stamp + +#### setup #### +GTK_DOC_V_SETUP = $(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_ = $(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0 = @echo " DOC Preparing build"; + +#### scan #### +GTK_DOC_V_SCAN = $(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_ = $(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0 = @echo " DOC Scanning header files"; +GTK_DOC_V_INTROSPECT = $(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; + +#### xml #### +GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0 = @echo " DOC Building XML"; + +#### html #### +GTK_DOC_V_HTML = $(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_ = $(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0 = @echo " DOC Building HTML"; +GTK_DOC_V_XREF = $(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_ = $(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0 = @echo " DOC Fixing cross-references"; + +#### pdf #### +GTK_DOC_V_PDF = $(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_ = $(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0 = @echo " DOC Building PDF"; # This includes the standard gtk-doc make rules, copied by gtkdocize. @@ -347,6 +636,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) \ all: all-am .SUFFIXES: +.SUFFIXES: .log .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -386,105 +676,168 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -tags: TAGS -TAGS: - -ctags: CTAGS -CTAGS: - - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -522,6 +875,7 @@ distdir: $(DISTFILES) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am +@ENABLE_GTK_DOC_FALSE@all-local: all-am: Makefile all-local installdirs: install: install-am @@ -544,6 +898,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) @@ -625,53 +982,55 @@ uninstall-am: uninstall-local .MAKE: check-am install-am install-strip .PHONY: all all-am all-local check check-TESTS check-am clean \ - clean-generic clean-libtool clean-local dist-hook distclean \ - distclean-generic distclean-libtool distclean-local distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-local - - -@ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -@ENABLE_GTK_DOC_FALSE@all-local: + clean-generic clean-libtool clean-local cscopelist-am ctags-am \ + dist-hook distclean distclean-generic distclean-libtool \ + distclean-local distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + recheck tags-am uninstall uninstall-am uninstall-local + + +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +@ENABLE_GTK_DOC_TRUE@all-local: all-gtk-doc docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) $(REPORT_FILES): sgml-build.stamp -#### setup #### - setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi - @touch setup-build.stamp - -#### scan #### + $(AM_V_at)touch setup-build.stamp -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -686,32 +1045,25 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### xml #### - sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) - @echo ' DOC Building XML' - @_source_dir='' ; \ + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true -#### html #### - html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -732,16 +1084,12 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -758,13 +1106,16 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -773,7 +1124,7 @@ distclean-local: rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -809,12 +1160,14 @@ uninstall-local: # # Require gtk-doc when making dist # -@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc: -@ENABLE_GTK_DOC_FALSE@ @echo "*** gtk-doc must be installed and enabled in order to make dist" -@ENABLE_GTK_DOC_FALSE@ @false - -dist-hook: dist-check-gtkdoc dist-hook-local +@HAVE_GTK_DOC_TRUE@dist-check-gtkdoc: docs +@HAVE_GTK_DOC_FALSE@dist-check-gtkdoc: +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc is needed to run 'make dist'. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** gtk-doc was not found when 'configure' ran. ***" +@HAVE_GTK_DOC_FALSE@ @echo "*** please install gtk-doc and rerun 'configure'. ***" +@HAVE_GTK_DOC_FALSE@ @false + +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/html @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ diff --git a/docs/reference/html/SignonAuthService.html b/docs/reference/html/SignonAuthService.html index b4ecbb1..aae9ad2 100644 --- a/docs/reference/html/SignonAuthService.html +++ b/docs/reference/html/SignonAuthService.html @@ -45,7 +45,7 @@ void -(*SignonQueryIdentitiesCb) () +(*SignonQueryMethodsCb) () @@ -61,7 +61,7 @@ void -(*SignonQueryMethodsCb) () +(*SignonQueryIdentitiesCb) () @@ -77,7 +77,7 @@ void -signon_auth_service_query_identities () +signon_auth_service_query_methods () @@ -93,7 +93,7 @@ void -signon_auth_service_query_methods () +signon_auth_service_query_identities () @@ -109,19 +109,19 @@ struct -SignonAuthService +SignonAuthServiceClass struct -SignonAuthServiceClass +SignonAuthService typedef -SignonIdentityFilter +SignonIdentityList typedef -SignonIdentityList +SignonIdentityFilter @@ -140,13 +140,13 @@ functions to query existing identities, available methods and their mechanisms.<

Functions

-

SignonQueryIdentitiesCb ()

+

SignonQueryMethodsCb ()

void
-(*SignonQueryIdentitiesCb) (SignonAuthService *auth_service,
-                            SignonIdentityList *identities,
-                            const GError *error,
-                            gpointer user_data);
-

Callback to be passed to signon_auth_service_query_identities().

+(*SignonQueryMethodsCb) (SignonAuthService *auth_service, + gchar **methods, + const GError *error, + gpointer user_data); +

Callback to be passed to signon_auth_service_query_methods().

Parameters

@@ -162,9 +162,9 @@ functions to query existing identities, available methods and their mechanisms.< - - - + + + @@ -230,13 +230,13 @@ functions to query existing identities, available methods and their mechanisms.<
-

SignonQueryMethodsCb ()

+

SignonQueryIdentitiesCb ()

void
-(*SignonQueryMethodsCb) (SignonAuthService *auth_service,
-                         gchar **methods,
-                         const GError *error,
-                         gpointer user_data);
-

Callback to be passed to signon_auth_service_query_methods().

+(*SignonQueryIdentitiesCb) (SignonAuthService *auth_service, + SignonIdentityList *identities, + const GError *error, + gpointer user_data); +

Callback to be passed to signon_auth_service_query_identities().

Parameters

 

identities

GList based list of SignonIdentityInfo.

[transfer full]

methods

list of available methods.

[transfer full][type GStrv]

error
@@ -252,9 +252,9 @@ functions to query existing identities, available methods and their mechanisms.< - - - + + + @@ -284,38 +284,14 @@ signon_auth_service_new ();
-

signon_auth_service_query_identities ()

+

signon_auth_service_query_methods ()

void
-signon_auth_service_query_identities (SignonAuthService *auth_service,
-                                      SignonIdentityFilter *filter,
-                                      const gchar *application_context,
-                                      SignonQueryIdentitiesCb cb,
-                                      gpointer user_data);
-

Query available identities, possibly applying a filter.

-

filter - is a GHashTable that contains filter conditions in the form of -string keys and GVariant values. Currently the following keys are supported:

-
-

The meaning of application_context - is explained in SignonSecurityContext. -It is used by GSignondAccessControlManager to determine if the requesting -application is a keychain application. If it is, then all identites will be -returned (subject to "Owner" key in filter -). If it's not, then only the -identites which the application owns will be returned (but "Type" and "Caption" -can still be set in the filter -).

+signon_auth_service_query_methods (SignonAuthService *auth_service, + SignonQueryMethodsCb cb, + gpointer user_data); +

Lists all the available authentication methods.

-

Parameters

+

Parameters

 

methods

list of available methods.

[transfer full][type GStrv]

identities

GList based list of SignonIdentityInfo.

[transfer full]

error
@@ -329,16 +305,6 @@ can still be set in the filter - - - - - - - - - - @@ -397,14 +363,38 @@ retrieved.

-

signon_auth_service_query_methods ()

+

signon_auth_service_query_identities ()

void
-signon_auth_service_query_methods (SignonAuthService *auth_service,
-                                   SignonQueryMethodsCb cb,
-                                   gpointer user_data);
-

Lists all the available authentication methods.

+signon_auth_service_query_identities (SignonAuthService *auth_service, + SignonIdentityFilter *filter, + const gchar *application_context, + SignonQueryIdentitiesCb cb, + gpointer user_data); +

Query available identities, possibly applying a filter.

+

filter + is a GHashTable that contains filter conditions in the form of +string keys and GVariant values. Currently the following keys are supported:

+
+

The meaning of application_context + is explained in SignonSecurityContext. +It is used by GSignondAccessControlManager to determine if the requesting +application is a keychain application. If it is, then all identites will be +returned (subject to "Owner" key in filter +). If it's not, then only the +identites which the application owns will be returned (but "Type" and "Caption" +can still be set in the filter +).

-

Parameters

+

Parameters

 

filter

filter variant dictionary based on GHashTable.

 

application_context

application security context, can be NULL.

 

cb

callback to be invoked.

[scope async]
@@ -418,6 +408,16 @@ signon_auth_service_query_methods (  + + + + + + + + + + @@ -435,12 +435,6 @@ signon_auth_service_query_methods (

Types and Values

-

struct SignonAuthService

-
struct SignonAuthService;
-

Opaque struct. Use the accessor functions below.

-
-
-

struct SignonAuthServiceClass

struct SignonAuthServiceClass {
     GObjectClass parent_class;
@@ -448,7 +442,7 @@ signon_auth_service_query_methods (
 
Opaque struct. Use the accessor functions below.

 

-
Members

+
Members

filter

filter variant dictionary based on GHashTable.

 

application_context

application security context, can be NULL.

 

cb

callback to be invoked.

[scope async]
@@ -465,10 +459,9 @@ signon_auth_service_query_methods (
-

SignonIdentityFilter

-
typedef GHashTable SignonIdentityFilter;
-
-

GHashTable based filter variant dictionary.

+

struct SignonAuthService

+
struct SignonAuthService;
+

Opaque struct. Use the accessor functions below.

@@ -477,6 +470,13 @@ signon_auth_service_query_methods (

GList of SignonIdentity items.

+
+
+

SignonIdentityFilter

+
typedef GHashTable SignonIdentityFilter;
+
+

GHashTable based filter variant dictionary.

+
diff --git a/docs/reference/html/SignonAuthSession.html b/docs/reference/html/SignonAuthSession.html index e225e0f..701f2dd 100644 --- a/docs/reference/html/SignonAuthSession.html +++ b/docs/reference/html/SignonAuthSession.html @@ -44,49 +44,49 @@
- - @@ -118,7 +118,7 @@ void @@ -165,11 +165,11 @@ - + - + @@ -177,29 +177,33 @@ - + - - + + - + - + - + + + + + @@ -207,10 +211,6 @@ - - - -
-void +SignonAuthSession * -(*SignonAuthSessionProcessCb) () +signon_auth_session_new ()
-void +SignonAuthSession * -(*SignonAuthSessionQueryAvailableMechanismsCb) () +signon_auth_session_new_for_identity ()
-void +const gchar * -signon_auth_session_cancel () +signon_auth_session_get_method ()
const gchar * + +void -signon_auth_session_get_method () +(*SignonAuthSessionQueryAvailableMechanismsCb) ()
-SignonAuthSession * +void -signon_auth_session_new () +signon_auth_session_query_available_mechanisms ()
-SignonAuthSession * +void -signon_auth_session_new_for_identity () +(*SignonAuthSessionProcessCb) ()
-signon_auth_session_query_available_mechanisms () +signon_auth_session_cancel ()
#defineSIGNON_SESSION_DATA_CAPTIONSIGNON_SESSION_DATA_USERNAME
#defineSIGNON_SESSION_DATA_PROXYSIGNON_SESSION_DATA_SECRET
#define
#defineSIGNON_SESSION_DATA_RENEW_TOKENSIGNON_SESSION_DATA_PROXY
#defineSIGNON_SESSION_DATA_SECRETenumSignonSessionDataUiPolicy
#defineSIGNON_SESSION_DATA_TIMEOUTSIGNON_SESSION_DATA_UI_POLICY
#defineSIGNON_SESSION_DATA_UI_POLICYSIGNON_SESSION_DATA_CAPTION
#defineSIGNON_SESSION_DATA_USERNAMESIGNON_SESSION_DATA_TIMEOUT
#define SIGNON_SESSION_DATA_WINDOW_ID
#defineSIGNON_SESSION_DATA_RENEW_TOKEN
struct SignonAuthSession
struct SignonAuthSessionClass
enumSignonSessionDataUiPolicy
@@ -230,17 +230,15 @@ to

Functions

-

SignonAuthSessionProcessCb ()

-
void
-(*SignonAuthSessionProcessCb) (SignonAuthSession *self,
-                               GHashTable *session_data,
-                               const GError *error,
-                               gpointer user_data);
-

SignonAuthSessionProcessCb is deprecated and should not be used in newly-written code.

-

This callback is invoked when the authentication plugin delivers the result -of the signon_auth_session_process() operation.

+

signon_auth_session_new ()

+
SignonAuthSession *
+signon_auth_session_new (gint id,
+                         const gchar *method_name,
+                         GError **err);
+

Creates a new SignonAuthSession, which can be used to authenticate using +the specified method.

-

Parameters

+

Parameters

@@ -249,40 +247,40 @@ of the - - + + - - - - - - - + + - - + +

self

the SignonAuthSession.

id

the id of the SignonIdentity to be used. Can be 0, if this session is +not bound to any stored identity.

  

session_data

a dictionary with -the response.

[transfer full][element-type utf8 GValue]

error

a GError if an error occurred, NULL otherwise.

method_name

the name of the authentication method to be used.

  

user_data

the user data that was passed when installing this callback.

err

a pointer to a location which will contain the error, in case this +function fails.

  
+
+

Returns

+

a new SignonAuthSession.

+

+
-

SignonAuthSessionQueryAvailableMechanismsCb ()

-
void
-(*SignonAuthSessionQueryAvailableMechanismsCb)
-                               (SignonAuthSession *self,
-                                gchar **mechanisms,
-                                const GError *error,
-                                gpointer user_data);
-

Callback to be passed to signon_auth_session_query_available_mechanisms().

+

signon_auth_session_new_for_identity ()

+
SignonAuthSession *
+signon_auth_session_new_for_identity (SignonIdentity *identity,
+                                      const gchar *method_name,
+                                      GError **err);
+

Creates a new SignonAuthSession, which can be used to authenticate using +the specified method.

Parameters

@@ -293,35 +291,36 @@ the response.

- - + + - - - - - - - + + - - + +

self

the SignonAuthSession.

identity

SignonIdentity parent object.

  

mechanisms

list of available mechanisms.

[transfer full][type GStrv]

error

a GError if an error occurred, NULL otherwise.

method_name

the name of the authentication method to be used.

  

user_data

the user data that was passed when installing this callback.

err

a pointer to a location which will contain the error, in case this +function fails.

  
+
+

Returns

+

a new SignonAuthSession.

+

+
-

signon_auth_session_cancel ()

-
void
-signon_auth_session_cancel (SignonAuthSession *self);
-

Cancel the authentication session.

+

signon_auth_session_get_method ()

+
const gchar *
+signon_auth_session_get_method (SignonAuthSession *self);
+

Get the current authentication method.

Parameters

@@ -337,13 +336,22 @@ signon_auth_session_cancel ( +

Returns

+

the authentication method being used, or NULL on failure.

+

+
-

signon_auth_session_get_method ()

-
const gchar *
-signon_auth_session_get_method (SignonAuthSession *self);
-

Get the current authentication method.

+

SignonAuthSessionQueryAvailableMechanismsCb ()

+
void
+(*SignonAuthSessionQueryAvailableMechanismsCb)
+                               (SignonAuthSession *self,
+                                gchar **mechanisms,
+                                const GError *error,
+                                gpointer user_data);
+

Callback to be passed to signon_auth_session_query_available_mechanisms().

Parameters

@@ -352,30 +360,48 @@ signon_auth_session_get_method ( - + + - + + + + + + + + + + + + + + + + +

self

the SignonAuthSession.

  

mechanisms

list of available mechanisms.

[transfer full][type GStrv]

error

a GError if an error occurred, NULL otherwise.

 

user_data

the user data that was passed when installing this callback.

 
-
-

Returns

-

the authentication method being used, or NULL on failure.

-

-
-

signon_auth_session_new ()

-
SignonAuthSession *
-signon_auth_session_new (gint id,
-                         const gchar *method_name,
-                         GError **err);
-

Creates a new SignonAuthSession, which can be used to authenticate using -the specified method.

+

signon_auth_session_query_available_mechanisms ()

+
void
+signon_auth_session_query_available_mechanisms
+                               (SignonAuthSession *self,
+                                const gchar **wanted_mechanisms,
+                                SignonAuthSessionQueryAvailableMechanismsCb cb,
+                                gpointer user_data);
+

signon_auth_session_query_available_mechanisms is deprecated and should not be used in newly-written code.

+

Queries the mechanisms available for this authentication session. The result +will be the intersection between wanted_mechanisms + and the mechanisms +supported by the authentication plugin (and allowed by the SignonIdentity that this +session belongs to).

-

Parameters

+

Parameters

@@ -384,42 +410,42 @@ the specified method.

- - + + - - + + - - + + + + + + +

id

the id of the SignonIdentity to be used. Can be 0, if this session is -not bound to any stored identity.

self

the SignonAuthSession.

  

method_name

the name of the authentication method to be used.

wanted_mechanisms

a NULL-terminated list of mechanisms supported by the client.

  

err

a pointer to a location which will contain the error, in case this -function fails.

cb

a callback which will be called with the result.

[scope async]

user_data

user data to be passed to the callback.

  
-
-

Returns

-

a new SignonAuthSession.

-

-
-

signon_auth_session_new_for_identity ()

-
SignonAuthSession *
-signon_auth_session_new_for_identity (SignonIdentity *identity,
-                                      const gchar *method_name,
-                                      GError **err);
-

Creates a new SignonAuthSession, which can be used to authenticate using -the specified method.

+

SignonAuthSessionProcessCb ()

+
void
+(*SignonAuthSessionProcessCb) (SignonAuthSession *self,
+                               GHashTable *session_data,
+                               const GError *error,
+                               gpointer user_data);
+

SignonAuthSessionProcessCb is deprecated and should not be used in newly-written code.

+

This callback is invoked when the authentication plugin delivers the result +of the signon_auth_session_process() operation.

-

Parameters

+

Parameters

@@ -428,29 +454,29 @@ the specified method.

- - + + - - + + + + + + + - - + +

identity

SignonIdentity parent object.

self

the SignonAuthSession.

  

method_name

the name of the authentication method to be used.

session_data

a dictionary with +the response.

[transfer full][element-type utf8 GValue]

error

a GError if an error occurred, NULL otherwise.

  

err

a pointer to a location which will contain the error, in case this -function fails.

user_data

the user data that was passed when installing this callback.

  
-
-

Returns

-

a new SignonAuthSession.

-

-
@@ -526,9 +552,9 @@ signon_auth_session_process_async (

What specific parameters should be used can be found from authentication plugins' -documentation (look for parameters that are expected in gsignond_plugin_request_initial() -for the first step, and parameters that are expected in gsignond_plugin_request() for -the subsequent steps). See, for example, GSignondPasswordPlugin and GSignondDigestPlugin.

+documentation (look for parameters that are expected in gsignond_plugin_request_initial() +for the first step, and parameters that are expected in gsignond_plugin_request() for +the subsequent steps). See, for example, GSignondPasswordPlugin and GSignondDigestPlugin.

If the SignonIdentity that this session belongs to contains a username and a password, the daemon will pass them to the authentication plugin, otherwise they should be set directly in session_data @@ -620,27 +646,19 @@ signon_auth_session_process_finish ( a GVariant of type G_VARIANT_TYPE_VARDICT containing the authentication reply. As with signon_auth_session_process_async(), specific parameters contained in the GVariant can be found from plugins' documentation: -“response-final” for the final response, and “response” -for the intermediate responses. See, for example, GSignondPasswordPlugin -and GSignondDigestPlugin.

+“response-final” for the final response, and “response” +for the intermediate responses. See, for example, GSignondPasswordPlugin +and GSignondDigestPlugin.

Since 1.8

-

signon_auth_session_query_available_mechanisms ()

+

signon_auth_session_cancel ()

void
-signon_auth_session_query_available_mechanisms
-                               (SignonAuthSession *self,
-                                const gchar **wanted_mechanisms,
-                                SignonAuthSessionQueryAvailableMechanismsCb cb,
-                                gpointer user_data);
-

Queries the mechanisms available for this authentication session. The result -will be the intersection between wanted_mechanisms - and the mechanisms -supported by the authentication plugin (and allowed by the SignonIdentity that this -session belongs to).

+signon_auth_session_cancel (SignonAuthSession *self); +

Cancel the authentication session.

Parameters

@@ -649,28 +667,11 @@ session belongs to).

- - + - - - - - - - - - - - - - - - - - +

self

the SignonAuthSession.

  

wanted_mechanisms

a NULL-terminated list of mechanisms supported by the client.

 

cb

a callback which will be called with the result.

[scope async]

user_data

user data to be passed to the callback.

 
@@ -678,17 +679,17 @@ session belongs to).

Types and Values

-

SIGNON_SESSION_DATA_CAPTION

-
#define SIGNON_SESSION_DATA_CAPTION       "Caption"
+
SIGNON_SESSION_DATA_USERNAME

+
#define SIGNON_SESSION_DATA_USERNAME      "UserName"
 

-
Caption for the UI dialog.

+
Username.
-

SIGNON_SESSION_DATA_PROXY

-
#define SIGNON_SESSION_DATA_PROXY         "NetworkProxy"
+
SIGNON_SESSION_DATA_SECRET

+
#define SIGNON_SESSION_DATA_SECRET        "Secret"
 

-
Proxy.

+
Secret.
@@ -699,24 +700,56 @@ session belongs to).

-

SIGNON_SESSION_DATA_RENEW_TOKEN

-
#define SIGNON_SESSION_DATA_RENEW_TOKEN   "RenewToken"
+
SIGNON_SESSION_DATA_PROXY

+
#define SIGNON_SESSION_DATA_PROXY         "NetworkProxy"
 

-
Requests the signon plugin to obtain a new token (boolean).

+
Proxy.
-

SIGNON_SESSION_DATA_SECRET

-
#define SIGNON_SESSION_DATA_SECRET        "Secret"
-
-

Secret.

+

enum SignonSessionDataUiPolicy

+

UI policy for the signon process, passed to the UI plugin.

+
+

Members

+
+++++ + + + + + + + + + + + + + + + + + + + + + + +

SIGNON_POLICY_DEFAULT

 +

The plugin can decide when to show UI.

+		 

SIGNON_POLICY_REQUEST_PASSWORD

 +

Force the user to enter the password.

+		 

SIGNON_POLICY_NO_USER_INTERACTION

 +

No UI elements will be shown to the user.

+		 

SIGNON_POLICY_VALIDATION

 +

UI elements can be shown to the user only when +CAPTCHA-like security measures are required.

+		 
-
-
-

SIGNON_SESSION_DATA_TIMEOUT

-
#define SIGNON_SESSION_DATA_TIMEOUT       "NetworkTimeout"
-
-

Network timeout, in milliseconds (uint32).

@@ -725,7 +758,7 @@ session belongs to).

Policy for the signon process.

-

Parameters

+

Parameters

@@ -742,10 +775,17 @@ session belongs to).

-

SIGNON_SESSION_DATA_USERNAME

-
#define SIGNON_SESSION_DATA_USERNAME      "UserName"
+
SIGNON_SESSION_DATA_CAPTION

+
#define SIGNON_SESSION_DATA_CAPTION       "Caption"
 

-
Username.

+
Caption for the UI dialog.

+
+
+
+

SIGNON_SESSION_DATA_TIMEOUT

+
#define SIGNON_SESSION_DATA_TIMEOUT       "NetworkTimeout"
+
+

Network timeout, in milliseconds (uint32).

@@ -756,6 +796,13 @@ session belongs to).

+

SIGNON_SESSION_DATA_RENEW_TOKEN

+
#define SIGNON_SESSION_DATA_RENEW_TOKEN   "RenewToken"
+
+

Requests the signon plugin to obtain a new token (boolean).

+
+
+

struct SignonAuthSession

struct SignonAuthSession;

Opaque struct. Use the accessor functions below.

@@ -769,7 +816,7 @@ session belongs to).

Opaque struct. Use the accessor functions below.

-

Members

+

Members

@@ -784,52 +831,6 @@ session belongs to).

-
-
-

enum SignonSessionDataUiPolicy

-

UI policy for the signon process, passed to the UI plugin.

-
-

Members

-
----- - - - - - - - - - - - - - - - - - - - - - - -

SIGNON_POLICY_DEFAULT

 -

The plugin can decide when to show UI.

-		 

SIGNON_POLICY_REQUEST_PASSWORD

 -

Force the user to enter the password.

-		 

SIGNON_POLICY_NO_USER_INTERACTION

 -

No UI elements will be shown to the user.

-		 

SIGNON_POLICY_VALIDATION

 -

UI elements can be shown to the user only when -CAPTCHA-like security measures are required.

-		 
-
-

Property Details

@@ -850,7 +851,7 @@ user_function (gchar *message, gpointer user_data)

Emitted when the state of the SignonAuthSession changes. The state change -is initiated by GSignondPlugin via “status-changed” signal.

+is initiated by GSignondPlugin via “status-changed” signal.

Parameters

diff --git a/docs/reference/html/SignonIdentity.html b/docs/reference/html/SignonIdentity.html index 364ee5a..f2f7127 100644 --- a/docs/reference/html/SignonIdentity.html +++ b/docs/reference/html/SignonIdentity.html @@ -47,47 +47,46 @@ void - @@ -103,46 +102,47 @@ void - @@ -166,7 +166,7 @@ void @@ -174,7 +174,7 @@ void @@ -182,7 +182,7 @@ void @@ -190,7 +190,7 @@ void @@ -198,7 +198,7 @@ void @@ -252,27 +252,27 @@ - + - + - + - + - + - +
-(*SignonIdentityInfoCb) () +(*SignonIdentityVoidCb) ()
-void +SignonIdentity * -(*SignonIdentitySessionReadyCb) () +signon_identity_new_from_db ()
-void +SignonIdentity * -(*SignonIdentityStoreCredentialsCb) () +signon_identity_new ()
-void +SignonIdentity * -(*SignonIdentityVerifyCb) () +signon_identity_new_with_context_from_db ()
-void +SignonIdentity * -(*SignonIdentityVoidCb) () +signon_identity_new_with_context ()
-void +const GError * -signon_identity_add_reference () +signon_identity_get_last_error ()
-signon_identity_get_auth_session () +(*SignonIdentityStoreCredentialsCb) ()
const GError * + +void -signon_identity_get_last_error () +signon_identity_store_credentials_with_info ()
-SignonIdentity * +void -signon_identity_new () +signon_identity_store_credentials_with_args ()
-SignonIdentity * +void -signon_identity_new_from_db () +(*SignonIdentityVerifyCb) ()
-SignonIdentity * +void -signon_identity_new_with_context () +signon_identity_verify_secret ()
-SignonIdentity * +void -signon_identity_new_with_context_from_db () +(*SignonIdentityInfoCb) ()
-signon_identity_remove_reference () +signon_identity_signout ()
-signon_identity_signout () +signon_identity_add_reference ()
-signon_identity_store_credentials_with_args () +signon_identity_remove_reference ()
-signon_identity_store_credentials_with_info () +(*SignonIdentitySessionReadyCb) ()
-signon_identity_verify_secret () +signon_identity_get_auth_session ()
structSignonIdentitySignonIdentityClass
structSignonIdentityClassSignonIdentity
typedefSignonIdentityReferenceAddedCbSignonIdentityRemovedCb
typedefSignonIdentityReferenceRemovedCbSignonIdentitySignedOutCb
typedefSignonIdentityRemovedCbSignonIdentityReferenceAddedCb
typedefSignonIdentitySignedOutCbSignonIdentityReferenceRemovedCb
@@ -370,13 +370,12 @@ secret from being stored in the database.

Functions

-

SignonIdentityInfoCb ()

+

SignonIdentityVoidCb ()

void
-(*SignonIdentityInfoCb) (SignonIdentity *self,
-                         SignonIdentityInfo *info,
+(*SignonIdentityVoidCb) (SignonIdentity *self,
                          const GError *error,
                          gpointer user_data);
-

Callback to be passed to signon_identity_query_info().

+

Generic callback to be passed to several SignonIdentity methods.

Parameters

@@ -392,12 +391,6 @@ secret from being stored in the database.

- - - - - @@ -413,64 +406,74 @@ secret from being stored in the database.

-

SignonIdentitySessionReadyCb ()

-
void
-(*SignonIdentitySessionReadyCb) (SignonAuthSession *self,
-                                 GError *error,
-                                 GDBusConnection *connection,
-                                 const gchar *bus_name,
-                                 const gchar *object_path);
-

Callback to be passed to signon_identity_get_auth_session().

+

signon_identity_new_from_db ()

+
SignonIdentity *
+signon_identity_new_from_db (guint32 id);
+

Construct an identity object associated with an existing identity +record. +This is essentially equivalent to calling +signon_identity_new_with_context_from_db() and passing NULL as the +application context.

+

Applications can determine the id + either by enumerating the identities with +signon_auth_service_query_identities() (if they're the owner of the identity) +or via other means (such as the system's accounts service, or an application +configuration).

-

Parameters

+

Parameters

 

info

the SignonIdentityInfo for self -.

[transfer none]

error

a GError if an error occurred, or NULL otherwise.

  
- - - - - - - - - - - - - - - - - - - - - - - - + + + - - +

self

the SignonAuthSession.

 

error

a GError if an error occurred, or NULL otherwise.

 

connection

a GDBusConnection for the session.

 

bus_name

a D-Bus bus name for the session.

 

object_path

a D-Bus object path for the session.

id

identity ID.

  
+
+

Returns

+

an instance of a SignonIdentity.

+

+
-

SignonIdentityStoreCredentialsCb ()

-
void
-(*SignonIdentityStoreCredentialsCb) (SignonIdentity *self,
-                                     guint32 id,
-                                     const GError *error,
-                                     gpointer user_data);
-

Callback to be passed to signon_identity_store_credentials_with_args() or -signon_identity_store_credentials_with_info().

+

signon_identity_new ()

+
SignonIdentity *
+signon_identity_new ();
+

Construct a new, empty, identity object. +This is essentially equivalent to calling signon_identity_new_with_context() +and passing NULL as the application context.

+
+

Returns

+

an instance of an SignonIdentity.

+

+
+
+
+
+

signon_identity_new_with_context_from_db ()

+
SignonIdentity *
+signon_identity_new_with_context_from_db
+                               (guint32 id,
+                                const gchar *application_context);
+

Construct an identity object associated with an existing identity +record. See SignonSecurityContext for a discussion of application_context + contents. +Together with the system context it is used to determine by the gSSO daemon +if the application can access the identity (the application needs to be either the +identity's owner or to be present on the ACL).

+

Applications can determine the id + either by enumerating the identities with +signon_auth_service_query_identities() (if they're the owner of the identity) +or via other means (such as the system's accounts service, or an application +configuration).

-

Parameters

+

Parameters

@@ -479,147 +482,82 @@ secret from being stored in the database.

- - - - - - - - - - - + - - + +

self

the SignonIdentity.

 

id

the numeric ID of the identity in the database.

 

error

a GError if an error occurred, or NULL otherwise.

identity ID.

  

user_data

the user data that was passed when installing this callback.

application_context

application security context, can be NULL.

  
+
+

Returns

+

an instance of a SignonIdentity.

+

+
-

SignonIdentityVerifyCb ()

-
void
-(*SignonIdentityVerifyCb) (SignonIdentity *self,
-                           gboolean valid,
-                           const GError *error,
-                           gpointer user_data);
-

Callback to be passed to signon_identity_verify_secret().

+

signon_identity_new_with_context ()

+
SignonIdentity *
+signon_identity_new_with_context (const gchar *application_context);
+

Construct a new, empty, identity object. See SignonSecurityContext for a +discussion of application_context + contents. application_context + is used to set the identity's owner +if the identity is stored to the database with signon_identity_store_credentials_with_args() +or signon_identity_store_credentials_with_info().

-

Parameters

+

Parameters

- - - - - - - - - - - - - - - - - - - + + + - - +

self

the SignonIdentity.

 

valid

whether the secret is valid.

 

error

a GError if an error occurred, or NULL otherwise.

 

user_data

the user data that was passed when installing this callback.

application_context

application security context, can be NULL.

  
+
+

Returns

+

an instance of an SignonIdentity.

+

+
-

SignonIdentityVoidCb ()

-
void
-(*SignonIdentityVoidCb) (SignonIdentity *self,
-                         const GError *error,
-                         gpointer user_data);
-

Generic callback to be passed to several SignonIdentity methods.

+

signon_identity_get_last_error ()

+
const GError *
+signon_identity_get_last_error (SignonIdentity *identity);
+

Get the most recent error that occurred on identity +.

-

Parameters

+

Parameters

- - - + + - - - - - - - - - - - - +

self

identity

the SignonIdentity.

  

error

a GError if an error occurred, or NULL otherwise.

 

user_data

the user data that was passed when installing this callback.

 
-
-
-
-

signon_identity_add_reference ()

-
void
-signon_identity_add_reference (SignonIdentity *self,
-                               const gchar *reference,
-                               SignonIdentityReferenceAddedCb cb,
-                               gpointer user_data);
-

Adds named reference to identity. Not currently supported by gSSO.

-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - -

self

the SignonIdentity.

 

reference

reference to be added

 

cb

callback

 

user_data

user_data.

 
+

Returns

+

a GError containing the most recent error, or NULL on failure.

+

@@ -668,14 +606,14 @@ supported by gSSO.

-

signon_identity_get_auth_session ()

+

SignonIdentityStoreCredentialsCb ()

void
-signon_identity_get_auth_session (SignonIdentity *self,
-                                  SignonAuthSession *session,
-                                  const gchar *method,
-                                  SignonIdentitySessionReadyCb cb);
-

Obtain a remote object for a local session object. Should not be used by -applications.

+(*SignonIdentityStoreCredentialsCb) (SignonIdentity *self, + guint32 id, + const GError *error, + gpointer user_data); +

Callback to be passed to signon_identity_store_credentials_with_args() or +signon_identity_store_credentials_with_info().

Parameters

@@ -691,19 +629,19 @@ applications.

- - + + - - + + - - - + + +
 

session

the SignonAuthSession object to get the remote object for.

id

the numeric ID of the identity in the database.

  

method

method name for the session.

error

a GError if an error occurred, or NULL otherwise.

  

cb

completion callback.

[scope async]

user_data

the user data that was passed when installing this callback.

 
@@ -711,11 +649,17 @@ applications.

-

signon_identity_get_last_error ()

-
const GError *
-signon_identity_get_last_error (SignonIdentity *identity);
-

Get the most recent error that occurred on identity -.

+

signon_identity_store_credentials_with_info ()

+
void
+signon_identity_store_credentials_with_info
+                               (SignonIdentity *self,
+                                const SignonIdentityInfo *info,
+                                SignonIdentityStoreCredentialsCb cb,
+                                gpointer user_data);
+

Stores the data contained in info + into the identity record in the database. +See above for the detailed discussion of the meaning of various fields and +their defaults.

Parameters

@@ -724,80 +668,174 @@ signon_identity_get_last_error ( - - + + + - + + + + + + + + + + + + + + + + +

identity

self

the SignonIdentity.

  

info

the SignonIdentityInfo data to store.

 

cb

callback.

[scope async]

user_data

user_data.

 
-
-

Returns

-

a GError containing the most recent error, or NULL on failure.

-

-
-

signon_identity_new ()

-
SignonIdentity *
-signon_identity_new ();
-

Construct a new, empty, identity object. -This is essentially equivalent to calling signon_identity_new_with_context() -and passing NULL as the application context.

+

signon_identity_store_credentials_with_args ()

+
void
+signon_identity_store_credentials_with_args
+                               (SignonIdentity *self,
+                                const gchar *username,
+                                const gchar *secret,
+                                const gboolean store_secret,
+                                GHashTable *methods,
+                                const gchar *caption,
+                                const gchar * const *realms,
+                                const SignonSecurityContext *owner,
+                                SignonSecurityContextList *access_control_list,
+                                SignonIdentityType type,
+                                SignonIdentityStoreCredentialsCb cb,
+                                gpointer user_data);
+

Stores the given data into the identity. See above for the meaning +of the specific fields.

-

Returns

-

an instance of an SignonIdentity.

-

+

Parameters

+
+++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

self

the SignonIdentity.

 

username

username.

[allow-none]

secret

secret.

[allow-none]

store_secret

whether gSSO should save the password in secret storage.

 

methods

allowed methods.

[transfer none][element-type utf8 GStrv]

caption

caption.

[allow-none]

realms

allowed realms.

[allow-none]

owner

owner.

[allow-none]

access_control_list

access control list.

[allow-none]

type

the type of the identity.

 

cb

callback.

[scope async]

user_data

user_data.

 
-

signon_identity_new_from_db ()

-
SignonIdentity *
-signon_identity_new_from_db (guint32 id);
-

Construct an identity object associated with an existing identity -record. -This is essentially equivalent to calling -signon_identity_new_with_context_from_db() and passing NULL as the -application context.

-

Applications can determine the id - either by enumerating the identities with -signon_auth_service_query_identities() (if they're the owner of the identity) -or via other means (such as the system's accounts service, or an application -configuration).

+

SignonIdentityVerifyCb ()

+
void
+(*SignonIdentityVerifyCb) (SignonIdentity *self,
+                           gboolean valid,
+                           const GError *error,
+                           gpointer user_data);
+

Callback to be passed to signon_identity_verify_secret().

-

Parameters

+

Parameters

- - - + + + + - + + + + + + + + + + + + + + + + +

id

identity ID.

self

the SignonIdentity.

  

valid

whether the secret is valid.

 

error

a GError if an error occurred, or NULL otherwise.

 

user_data

the user data that was passed when installing this callback.

 
-
-

Returns

-

an instance of a SignonIdentity.

-

-
-

signon_identity_new_with_context ()

-
SignonIdentity *
-signon_identity_new_with_context (const gchar *application_context);
-

Construct a new, empty, identity object. See SignonSecurityContext for a -discussion of application_context - contents. application_context - is used to set the identity's owner -if the identity is stored to the database with signon_identity_store_credentials_with_args() -or signon_identity_store_credentials_with_info().

+

signon_identity_verify_secret ()

+
void
+signon_identity_verify_secret (SignonIdentity *self,
+                               const gchar *secret,
+                               SignonIdentityVerifyCb cb,
+                               gpointer user_data);
+

Verifies the given secret. Not currently supported by gSSO.

Parameters

@@ -806,39 +844,42 @@ or - - - + + + + - -

application_context

application security context, can be NULL.

self

the SignonIdentity.

  
-
-
-

Returns

-

an instance of an SignonIdentity.

-

-
-
-
-
-

signon_identity_new_with_context_from_db ()

-
SignonIdentity *
-signon_identity_new_with_context_from_db
-                               (guint32 id,
-                                const gchar *application_context);
-

Construct an identity object associated with an existing identity -record. See SignonSecurityContext for a discussion of application_context - contents. -Together with the system context it is used to determine by the gSSO daemon -if the application can access the identity (the application needs to be either the -identity's owner or to be present on the ACL).

-

Applications can determine the id - either by enumerating the identities with -signon_auth_service_query_identities() (if they're the owner of the identity) -or via other means (such as the system's accounts service, or an application -configuration).

+ + +

secret

+

the secret (password) to be verified.

+  + + +

cb

+

callback.

+[scope async] + + +

user_data

+

user_data.

+  + + +
+
+
+
+
+

SignonIdentityInfoCb ()

+
void
+(*SignonIdentityInfoCb) (SignonIdentity *self,
+                         SignonIdentityInfo *info,
+                         const GError *error,
+                         gpointer user_data);
+

Callback to be passed to signon_identity_query_info().

-

Parameters

+

Parameters

@@ -847,23 +888,29 @@ configuration).

- - + + - - + + + + + + + + + + + +

id

identity ID.

self

the SignonIdentity.

  

application_context

application security context, can be NULL.

info

the SignonIdentityInfo for self +.

[transfer none]

error

a GError if an error occurred, or NULL otherwise.

 

user_data

the user data that was passed when installing this callback.

  
-
-

Returns

-

an instance of a SignonIdentity.

-

-
@@ -940,13 +987,14 @@ signon_identity_remove ( -

signon_identity_remove_reference ()

+

signon_identity_signout ()

void
-signon_identity_remove_reference (SignonIdentity *self,
-                                  const gchar *reference,
-                                  SignonIdentityReferenceRemovedCb cb,
-                                  gpointer user_data);
-

Removes named reference from identity. Not currently supported by gSSO.

+signon_identity_signout (SignonIdentity *self, + SignonIdentitySignedOutCb cb, + gpointer user_data); +

Asks signond to close all authentication sessions for this +identity, and to remove any stored secrets associated with it (password and +authentication tokens).

Parameters

@@ -962,14 +1010,9 @@ signon_identity_remove_reference (  - - - - - - - + + @@ -982,14 +1025,13 @@ signon_identity_remove_reference (
-

signon_identity_signout ()

+

signon_identity_add_reference ()

void
-signon_identity_signout (SignonIdentity *self,
-                         SignonIdentitySignedOutCb cb,
-                         gpointer user_data);
-

Asks signond to close all authentication sessions for this -identity, and to remove any stored secrets associated with it (password and -authentication tokens).

+signon_identity_add_reference (SignonIdentity *self, + const gchar *reference, + SignonIdentityReferenceAddedCb cb, + gpointer user_data); +

Adds named reference to identity. Not currently supported by gSSO.

Parameters

reference

reference to be removed

 

cb

callback

 

callback.

[scope async]

user_data

@@ -1005,9 +1047,14 @@ authentication tokens).

 + + + + + - - + + @@ -1020,23 +1067,13 @@ authentication tokens).

-

signon_identity_store_credentials_with_args ()

+

signon_identity_remove_reference ()

void
-signon_identity_store_credentials_with_args
-                               (SignonIdentity *self,
-                                const gchar *username,
-                                const gchar *secret,
-                                const gboolean store_secret,
-                                GHashTable *methods,
-                                const gchar *caption,
-                                const gchar * const *realms,
-                                const SignonSecurityContext *owner,
-                                SignonSecurityContextList *access_control_list,
-                                SignonIdentityType type,
-                                SignonIdentityStoreCredentialsCb cb,
-                                gpointer user_data);
-

Stores the given data into the identity. See above for the meaning -of the specific fields.

+signon_identity_remove_reference (SignonIdentity *self, + const gchar *reference, + SignonIdentityReferenceRemovedCb cb, + gpointer user_data); +

Removes named reference from identity. Not currently supported by gSSO.

Parameters

 

reference

reference to be added

 

cb

callback.

[scope async]

callback

 

user_data

@@ -1052,54 +1089,14 @@ of the specific fields.

 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + @@ -1112,17 +1109,14 @@ of the specific fields.

-

signon_identity_store_credentials_with_info ()

+

SignonIdentitySessionReadyCb ()

void
-signon_identity_store_credentials_with_info
-                               (SignonIdentity *self,
-                                const SignonIdentityInfo *info,
-                                SignonIdentityStoreCredentialsCb cb,
-                                gpointer user_data);
-

Stores the data contained in info - into the identity record in the database. -See above for the detailed discussion of the meaning of various fields and -their defaults.

+(*SignonIdentitySessionReadyCb) (SignonAuthSession *self, + GError *error, + GDBusConnection *connection, + const gchar *bus_name, + const gchar *object_path); +

Callback to be passed to signon_identity_get_auth_session().

Parameters

 

username

username.

[allow-none]

secret

secret.

[allow-none]

store_secret

whether gSSO should save the password in secret storage.

 

methods

allowed methods.

[transfer none][element-type utf8 GStrv]

caption

caption.

[allow-none]

realms

allowed realms.

[allow-none]

owner

owner.

[allow-none]

access_control_list

access control list.

[allow-none]

type

the type of the identity.

reference

reference to be removed

  

cb

callback.

[scope async]

callback

 

user_data

@@ -1134,22 +1128,27 @@ their defaults.

 - + - - + + - - - + + + - - + + + + + + + @@ -1158,13 +1157,14 @@ their defaults.

-

signon_identity_verify_secret ()

+

signon_identity_get_auth_session ()

void
-signon_identity_verify_secret (SignonIdentity *self,
-                               const gchar *secret,
-                               SignonIdentityVerifyCb cb,
-                               gpointer user_data);
-

Verifies the given secret. Not currently supported by gSSO.

+signon_identity_get_auth_session (SignonIdentity *self, + SignonAuthSession *session, + const gchar *method, + SignonIdentitySessionReadyCb cb); +

Obtain a remote object for a local session object. Should not be used by +applications.

Parameters

self

the SignonIdentity.

the SignonAuthSession.

  

info

the SignonIdentityInfo data to store.

error

a GError if an error occurred, or NULL otherwise.

  

cb

callback.

[scope async]

connection

a GDBusConnection for the session.

 

user_data

user_data.

bus_name

a D-Bus bus name for the session.

 

object_path

a D-Bus object path for the session.

  
@@ -1180,19 +1180,19 @@ signon_identity_verify_secret (  - - + + - - - + + + - - - + + +

secret

the secret (password) to be verified.

session

the SignonAuthSession object to get the remote object for.

  

cb

callback.

[scope async]

method

method name for the session.

 

user_data

user_data.

 

cb

completion callback.

[scope async]
@@ -1202,12 +1202,6 @@ signon_identity_verify_secret (

Types and Values

-

struct SignonIdentity

-
struct SignonIdentity;
-

Opaque struct. Use the accessor functions below.

-
-
-

struct SignonIdentityClass

struct SignonIdentityClass {
     GObjectClass parent_class;
@@ -1215,7 +1209,7 @@ signon_identity_verify_secret (
 
Opaque struct. Use the accessor functions below.

 

-
Members

+
Members

 
@@ -1232,17 +1226,9 @@ signon_identity_verify_secret (
 

 

-
SignonIdentityReferenceAddedCb

-
typedef SignonIdentityVoidCb SignonIdentityReferenceAddedCb;
-

-
Callback to be passed to signon_identity_add_reference().

-

-

-

-
SignonIdentityReferenceRemovedCb

-
typedef SignonIdentityVoidCb SignonIdentityReferenceRemovedCb;
-

-
Callback to be passed to signon_identity_remove_reference().

+
struct SignonIdentity

+
struct SignonIdentity;

+
Opaque struct. Use the accessor functions below.

 

 

 

@@ -1258,6 +1244,20 @@ signon_identity_verify_secret (
 
Callback to be passed to signon_identity_signout().

 

+

+

+
SignonIdentityReferenceAddedCb

+
typedef SignonIdentityVoidCb SignonIdentityReferenceAddedCb;
+

+
Callback to be passed to signon_identity_add_reference().

+

+

+

+
SignonIdentityReferenceRemovedCb

+
typedef SignonIdentityVoidCb SignonIdentityReferenceRemovedCb;
+

+
Callback to be passed to signon_identity_remove_reference().

+

 
 

 
Property Details

diff --git a/docs/reference/html/SignonIdentityInfo.html b/docs/reference/html/SignonIdentityInfo.html
index 0d0fb14..27faabc 100644
--- a/docs/reference/html/SignonIdentityInfo.html
+++ b/docs/reference/html/SignonIdentityInfo.html
@@ -42,57 +42,56 @@
 

-
@@ -104,40 +103,41 @@
 
 
-
-
-
@@ -145,7 +145,7 @@
 void
 
 
@@ -153,7 +153,7 @@
 void
 
 
@@ -161,7 +161,7 @@
 void
 
 
@@ -169,7 +169,7 @@
 void
 
 
@@ -177,7 +177,7 @@
 void
 
 
@@ -185,7 +185,7 @@
 void
 
 
@@ -193,7 +193,7 @@
 void
 
 
@@ -217,7 +217,7 @@
 void
 
 
@@ -225,7 +225,7 @@
 void
 
 
@@ -233,7 +233,7 @@
 void
 
 
@@ -248,13 +248,13 @@
 
 
-
-
-
-
+
+
+
+

 
 

 

 
-void
+SignonIdentityInfo *
 
 
-signon_identity_info_access_control_list_append ()
+signon_identity_info_new ()
 
 

 

 
-SignonIdentityInfo *
+void
 
 
-signon_identity_info_copy ()
+signon_identity_info_free ()
 
 

 

 
-void
+SignonIdentityInfo *
 
 
-signon_identity_info_free ()
+signon_identity_info_copy ()
 
 

 

 
-SignonSecurityContextList *
+gint
 
 
-signon_identity_info_get_access_control_list ()
+signon_identity_info_get_id ()
 
 

 

 const gchar *
 
 
-signon_identity_info_get_caption ()
+signon_identity_info_get_username ()
 
 

 

 
-gint
+gboolean
 
 
-signon_identity_info_get_id ()
+signon_identity_info_get_storing_secret ()
 
 

 

-SignonIdentityType
+const gchar *
 
 
-signon_identity_info_get_identity_type ()
+signon_identity_info_get_caption ()
 
 

 

 
const SignonSecurityContext *
+const gchar * const *
 
 
-signon_identity_info_get_owner ()
+signon_identity_info_get_realms ()
 
 

 
const gchar * const *
+const SignonSecurityContext *
 
 
-signon_identity_info_get_realms ()
+signon_identity_info_get_owner ()
 
 

 

 
-gboolean
+SignonSecurityContextList *
 
 
-signon_identity_info_get_storing_secret ()
+signon_identity_info_get_access_control_list ()
 
 

 
const gchar *
+
+SignonIdentityType
 
 
-signon_identity_info_get_username ()
+signon_identity_info_get_identity_type ()
 
 

 

 
-SignonIdentityInfo *
+void
 
 
-signon_identity_info_new ()
+signon_identity_info_set_username ()
 
 

 

-signon_identity_info_own_methods ()
+signon_identity_info_set_secret ()
 
 

 

-signon_identity_info_remove_method ()
+signon_identity_info_set_caption ()
 
 

 

-signon_identity_info_set_access_control_list ()
+signon_identity_info_set_methods ()
 
 

 

-signon_identity_info_set_caption ()
+signon_identity_info_own_methods ()
 
 

 

-signon_identity_info_set_identity_type ()
+signon_identity_info_set_method ()
 
 

 

-signon_identity_info_set_method ()
+signon_identity_info_remove_method ()
 
 

 

-signon_identity_info_set_methods ()
+signon_identity_info_set_realms ()
 
 

 

-signon_identity_info_set_realms ()
+signon_identity_info_set_access_control_list ()
 
 

 

-signon_identity_info_set_secret ()
+signon_identity_info_access_control_list_append ()
 
 

 

-signon_identity_info_set_username ()
+signon_identity_info_set_identity_type ()
 
 

 
 
 SignonIdentityInfo

 enum
 SignonIdentityType
 
 SignonIdentityInfo

 
 

 

@@ -274,32 +274,35 @@ of what each item means and how and when it's used.

 

 
Functions

 

-
signon_identity_info_access_control_list_append ()

+
signon_identity_info_new ()

+
SignonIdentityInfo *
+signon_identity_info_new ();

+
Creates a new SignonIdentityInfo item.

+

+
Returns

+
 a new SignonIdentityInfo item.

+

+

+

+

+

+
signon_identity_info_free ()

 
void
-signon_identity_info_access_control_list_append
-                               (SignonIdentityInfo *info,
-                                SignonSecurityContext *security_context);

-
Appends a new SignonSecurityContext item to the access control list.

+signon_identity_info_free (SignonIdentityInfo *info);
+

Destroys the given SignonIdentityInfo item.

-

Parameters

+

Parameters

- - + - - - - - - - +

info

the SignonIdentityInfo.

  

security_context

a security context to be appended.

[transfer full]
@@ -311,7 +314,7 @@ signon_identity_info_copy (const Get a newly-allocated copy of info .

-

Parameters

+

Parameters

@@ -326,40 +329,18 @@ signon_identity_info_copy (const
-

Returns

+

Returns

a copy of the given SignonIdentityInfo, or NULL on failure.

-

signon_identity_info_free ()

-
void
-signon_identity_info_free (SignonIdentityInfo *info);
-

Destroys the given SignonIdentityInfo item.

-
-

Parameters

-
----- - - - - - -

info

the SignonIdentityInfo.

 
-
-
-
-
-

signon_identity_info_get_access_control_list ()

-
SignonSecurityContextList *
-signon_identity_info_get_access_control_list
-                               (const SignonIdentityInfo *info);
-

Get an access control list associated with an identity.

+

signon_identity_info_get_id ()

+
gint
+signon_identity_info_get_id (const SignonIdentityInfo *info);
+

Get the numeric identity ID of info +.

Parameters

@@ -377,17 +358,16 @@ signon_identity_info_get_access_control_list

Returns

-

a list of ACL security contexts.

-

[transfer none]

+

the numeric ID of the identity.

+

-

signon_identity_info_get_caption ()

+

signon_identity_info_get_username ()

const gchar *
-signon_identity_info_get_caption (const SignonIdentityInfo *info);
-

Get the display name of info -.

+signon_identity_info_get_username (const SignonIdentityInfo *info); +

Get the username associated with an identity.

Parameters

@@ -405,17 +385,18 @@ signon_identity_info_get_caption (const

Returns

-

the display name for the identity.

+

the username, or NULL.

-

signon_identity_info_get_id ()

-
gint
-signon_identity_info_get_id (const SignonIdentityInfo *info);
-

Get the numeric identity ID of info -.

+

signon_identity_info_get_storing_secret ()

+
gboolean
+signon_identity_info_get_storing_secret
+                               (const SignonIdentityInfo *info);
+

Get whether the secret of info + should be stored by gSSO in the secret database.

Parameters

@@ -433,17 +414,17 @@ signon_identity_info_get_id (const

Returns

-

the numeric ID of the identity.

+

TRUE if gSSO must store the secret, FALSE otherwise.

-

signon_identity_info_get_identity_type ()

-
SignonIdentityType
-signon_identity_info_get_identity_type
-                               (const SignonIdentityInfo *info);
-

Get the type of the identity.

+

signon_identity_info_get_caption ()

+
const gchar *
+signon_identity_info_get_caption (const SignonIdentityInfo *info);
+

Get the display name of info +.

Parameters

@@ -461,7 +442,7 @@ signon_identity_info_get_identity_type

Returns

-

the type of the identity.

+

the display name for the identity.

@@ -497,10 +478,11 @@ methods and mechanisms.

-

signon_identity_info_get_owner ()

-
const SignonSecurityContext *
-signon_identity_info_get_owner (const SignonIdentityInfo *info);
-

Get identity owner's security context.

+

signon_identity_info_get_realms ()

+
const gchar * const *
+signon_identity_info_get_realms (const SignonIdentityInfo *info);
+

Get an array of the allowed realms of info +.

Parameters

@@ -518,17 +500,16 @@ signon_identity_info_get_owner (const

Returns

-

a security context.

+

a NULL terminated array of realms.

[transfer none]

-

signon_identity_info_get_realms ()

-
const gchar * const *
-signon_identity_info_get_realms (const SignonIdentityInfo *info);
-

Get an array of the allowed realms of info -.

+

signon_identity_info_get_owner ()

+
const SignonSecurityContext *
+signon_identity_info_get_owner (const SignonIdentityInfo *info);
+

Get identity owner's security context.

Parameters

@@ -546,18 +527,17 @@ signon_identity_info_get_realms (const

Returns

-

a NULL terminated array of realms.

+

a security context.

[transfer none]

-

signon_identity_info_get_storing_secret ()

-
gboolean
-signon_identity_info_get_storing_secret
+
signon_identity_info_get_access_control_list ()

+
SignonSecurityContextList *
+signon_identity_info_get_access_control_list
                                (const SignonIdentityInfo *info);

-
Get whether the secret of info
- should be stored by gSSO in the secret database.

+
Get an access control list associated with an identity.

 

 
Parameters
@@ -575,16 +555,17 @@ signon_identity_info_get_storing_secret

Returns

-

TRUE if gSSO must store the secret, FALSE otherwise.

-

+

a list of ACL security contexts.

+

[transfer none]

-

signon_identity_info_get_username ()

-
const gchar *
-signon_identity_info_get_username (const SignonIdentityInfo *info);
-

Get the username associated with an identity.

+

signon_identity_info_get_identity_type ()

+
SignonIdentityType
+signon_identity_info_get_identity_type
+                               (const SignonIdentityInfo *info);
+

Get the type of the identity.

Parameters

@@ -602,33 +583,51 @@ signon_identity_info_get_username (const

Returns

-

the username, or NULL.

+

the type of the identity.

-

signon_identity_info_new ()

-
SignonIdentityInfo *
-signon_identity_info_new ();
-

Creates a new SignonIdentityInfo item.

+

signon_identity_info_set_username ()

+
void
+signon_identity_info_set_username (SignonIdentityInfo *info,
+                                   const gchar *username);
+

Sets the username for the identity.

-

Returns

-

a new SignonIdentityInfo item.

-

+

Parameters

+
+++++ + + + + + + + + + + + + +

info

the SignonIdentityInfo.

 

username

the username.

 
-

signon_identity_info_own_methods ()

+

signon_identity_info_set_secret ()

void
-signon_identity_info_own_methods (SignonIdentityInfo *info,
-                                  GHashTable *methods);
-

Set authentication methods that are allowed to be used with this identity.

-

This function will just increment reference count of hash table, so -it should be constructed with g_hash_table_new_full.

+signon_identity_info_set_secret (SignonIdentityInfo *info, + const gchar *secret, + gboolean store_secret); +

Sets the secret (password) for the identity, and whether the gSSO daemon +should remember it.

-

Parameters

+

Parameters

@@ -642,9 +641,14 @@ it should be constructed with   - - - + + + + + + + +

methods

(element-type utf8 GStrv): methods.

[transfer none]

secret

the secret.

 

store_secret

whether signond should store the secret in its DB.

 
@@ -652,12 +656,11 @@ it should be constructed with -

signon_identity_info_remove_method ()

+

signon_identity_info_set_caption ()

void
-signon_identity_info_remove_method (SignonIdentityInfo *info,
-                                    const gchar *method);
-

Remove method - from the list of allowed authentication methods.

+signon_identity_info_set_caption (SignonIdentityInfo *info, + const gchar *caption); +

Sets the caption (display name) for the identity.

Parameters

@@ -673,8 +676,8 @@ signon_identity_info_remove_method (  - - + + @@ -683,12 +686,11 @@ signon_identity_info_remove_method (
-

signon_identity_info_set_access_control_list ()

+

signon_identity_info_set_methods ()

void
-signon_identity_info_set_access_control_list
-                               (SignonIdentityInfo *info,
-                                SignonSecurityContextList *access_control_list);
-

Set an access control list associated with an identity.

+signon_identity_info_set_methods (SignonIdentityInfo *info, + GHashTable *methods); +

Set authentication methods that are allowed to be used with this identity.

Parameters

method

an authentication method.

caption

the caption.

  
@@ -704,8 +706,8 @@ signon_identity_info_set_access_control_list - - + + @@ -714,13 +716,15 @@ signon_identity_info_set_access_control_list
-

signon_identity_info_set_caption ()

+

signon_identity_info_own_methods ()

void
-signon_identity_info_set_caption (SignonIdentityInfo *info,
-                                  const gchar *caption);
-

Sets the caption (display name) for the identity.

+signon_identity_info_own_methods (SignonIdentityInfo *info, + GHashTable *methods); +

Set authentication methods that are allowed to be used with this identity.

+

This function will just increment reference count of hash table, so +it should be constructed with g_hash_table_new_full.

-

Parameters

+

Parameters

 

access_control_list

a list of ACL security contexts.

methods

(element-type utf8 GStrv): methods.

[transfer none]
@@ -734,9 +738,9 @@ signon_identity_info_set_caption (  - - - + + +

caption

the caption.

 

methods

(element-type utf8 GStrv): methods.

[transfer none]
@@ -744,12 +748,12 @@ signon_identity_info_set_caption (
-

signon_identity_info_set_identity_type ()

+

signon_identity_info_set_method ()

void
-signon_identity_info_set_identity_type
-                               (SignonIdentityInfo *info,
-                                SignonIdentityType type);
-

Specifies the type of this identity.

+signon_identity_info_set_method (SignonIdentityInfo *info, + const gchar *method, + const gchar * const *mechanisms); +

Adds a method to the list of allowed authentication methods.

Parameters

@@ -765,8 +769,13 @@ signon_identity_info_set_identity_type - - + + + + + + + @@ -775,12 +784,12 @@ signon_identity_info_set_identity_type
-

signon_identity_info_set_method ()

+

signon_identity_info_remove_method ()

void
-signon_identity_info_set_method (SignonIdentityInfo *info,
-                                 const gchar *method,
-                                 const gchar * const *mechanisms);
-

Adds a method to the list of allowed authentication methods.

+signon_identity_info_remove_method (SignonIdentityInfo *info, + const gchar *method); +

Remove method + from the list of allowed authentication methods.

Parameters

 

type

the type of the identity.

method

an authentication method.

 

mechanisms

a NULL-terminated list of mechanisms.

  
@@ -800,22 +809,17 @@ signon_identity_info_set_method (

an authentication method.

 - - - - -
 

mechanisms

a NULL-terminated list of mechanisms.

 
-

signon_identity_info_set_methods ()

+

signon_identity_info_set_realms ()

void
-signon_identity_info_set_methods (SignonIdentityInfo *info,
-                                  GHashTable *methods);
-

Set authentication methods that are allowed to be used with this identity.

+signon_identity_info_set_realms (SignonIdentityInfo *info, + const gchar * const *realms); +

Specify what realms this identity can be used in.

Parameters

@@ -831,9 +835,9 @@ signon_identity_info_set_methods (  - - - + + +

methods

(element-type utf8 GStrv): methods.

[transfer none]

realms

a NULL-terminated list of realms.

 
@@ -908,11 +912,12 @@ signon_identity_info_set_owner_from_values
-

signon_identity_info_set_realms ()

+

signon_identity_info_set_access_control_list ()

void
-signon_identity_info_set_realms (SignonIdentityInfo *info,
-                                 const gchar * const *realms);
-

Specify what realms this identity can be used in.

+signon_identity_info_set_access_control_list + (SignonIdentityInfo *info, + SignonSecurityContextList *access_control_list); +

Set an access control list associated with an identity.

Parameters

@@ -928,9 +933,9 @@ signon_identity_info_set_realms (  - - - + + +

realms

a NULL-terminated list of realms.

 

access_control_list

a list of ACL security contexts.

[transfer none]
@@ -938,13 +943,12 @@ signon_identity_info_set_realms (
-

signon_identity_info_set_secret ()

+

signon_identity_info_access_control_list_append ()

void
-signon_identity_info_set_secret (SignonIdentityInfo *info,
-                                 const gchar *secret,
-                                 gboolean store_secret);
-

Sets the secret (password) for the identity, and whether the gSSO daemon -should remember it.

+signon_identity_info_access_control_list_append + (SignonIdentityInfo *info, + SignonSecurityContext *security_context); +

Appends a new SignonSecurityContext item to the access control list.

Parameters

@@ -960,14 +964,9 @@ should remember it.

- - - - - - - - + + +
 

secret

the secret.

 

store_secret

whether signond should store the secret in its DB.

 

security_context

a security context to be appended.

[transfer full]
@@ -975,11 +974,12 @@ should remember it.

-

signon_identity_info_set_username ()

+

signon_identity_info_set_identity_type ()

void
-signon_identity_info_set_username (SignonIdentityInfo *info,
-                                   const gchar *username);
-

Sets the username for the identity.

+signon_identity_info_set_identity_type + (SignonIdentityInfo *info, + SignonIdentityType type); +

Specifies the type of this identity.

Parameters

@@ -995,8 +995,8 @@ signon_identity_info_set_username (  - - + + @@ -1007,16 +1007,10 @@ signon_identity_info_set_username (

Types and Values

-

SignonIdentityInfo

-
typedef struct _SignonIdentityInfo SignonIdentityInfo;
-

Opaque struct. Use the accessor functions below.

-
-
-

enum SignonIdentityType

Identity types used in SignonIdentityInfo.

-

Members

+

Members

username

the username.

type

the type of the identity.

  
@@ -1056,6 +1050,12 @@ signon_identity_info_set_username ( +
+
+

SignonIdentityInfo

+
typedef struct _SignonIdentityInfo SignonIdentityInfo;
+

Opaque struct. Use the accessor functions below.

+
diff --git a/docs/reference/html/SignonSecurityContext.html b/docs/reference/html/SignonSecurityContext.html index 0ae4066..5c42fde 100644 --- a/docs/reference/html/SignonSecurityContext.html +++ b/docs/reference/html/SignonSecurityContext.html @@ -42,10 +42,10 @@
@@ -53,30 +53,31 @@ SignonSecurityContext * - @@ -88,58 +89,57 @@ - @@ -147,7 +147,7 @@ void @@ -208,37 +208,24 @@ any particular match rules used by a custom ACM (Access Control Manager).

Functions

-

signon_security_context_build_variant ()

-
GVariant *
-signon_security_context_build_variant (const SignonSecurityContext *ctx);
-

Build a GVariant of type "(ss)" from a SignonSecurityContext item.

-
-

Parameters

-
-GVariant * +SignonSecurityContext * -signon_security_context_build_variant () +signon_security_context_new ()
-signon_security_context_copy () +signon_security_context_new_from_values ()
-SignonSecurityContext * +void -signon_security_context_deconstruct_variant () +signon_security_context_free ()
-void +SignonSecurityContext * -signon_security_context_free () +signon_security_context_copy ()
const gchar * + +void -signon_security_context_get_application_context () +signon_security_context_set_system_context ()
-GVariant * +void -signon_security_context_list_build_variant () +signon_security_context_set_application_context ()
-SignonSecurityContextList * +const gchar * -signon_security_context_list_copy () +signon_security_context_get_application_context ()
-SignonSecurityContextList * +GVariant * -signon_security_context_list_deconstruct_variant () +signon_security_context_build_variant ()
-void +SignonSecurityContext * -signon_security_context_list_free () +signon_security_context_deconstruct_variant ()
-SignonSecurityContext * +GVariant * -signon_security_context_new () +signon_security_context_list_build_variant ()
-SignonSecurityContext * +SignonSecurityContextList * -signon_security_context_new_from_values () +signon_security_context_list_deconstruct_variant ()
-void +SignonSecurityContextList * -signon_security_context_set_application_context () +signon_security_context_list_copy ()
-signon_security_context_set_system_context () +signon_security_context_list_free ()
----- - - - - - -

ctx

SignonSecurityContext item.

 
-
+

signon_security_context_new ()

+
SignonSecurityContext *
+signon_security_context_new ();
+

Allocates a new security context item.

-

Returns

-

GVariant construct of a SignonSecurityContext.

+

Returns

+

allocated SignonSecurityContext.

[transfer full]

-

signon_security_context_copy ()

+

signon_security_context_new_from_values ()

SignonSecurityContext *
-signon_security_context_copy (const SignonSecurityContext *src_ctx);
-

Copy a security context item.

+signon_security_context_new_from_values + (const gchar *system_context, + const gchar *application_context); +

Allocates and initializes a new security context item.

Parameters

@@ -247,26 +234,32 @@ signon_security_context_copy (const - - - + + + + - + + + + + + +

src_ctx

source security context to copy.

system_context

system security context (such as SMACK/MSSF label/token).

  

application_context

application security context (such as a script name).

 

Returns

-

a copy of the SignonSecurityContext item.

+

allocated SignonSecurityContext.

[transfer full]

-

signon_security_context_deconstruct_variant ()

-
SignonSecurityContext *
-signon_security_context_deconstruct_variant
-                               (GVariant *variant);
-

Builds a SignonSecurityContext item from a GVariant of type "(ss)".

+

signon_security_context_free ()

+
void
+signon_security_context_free (SignonSecurityContext *ctx);
+

Frees a security context item.

Parameters

@@ -276,24 +269,19 @@ signon_security_context_deconstruct_variant - - + +

variant

GVariant item with a SignonSecurityContext construct.

ctx

SignonSecurityContext to be freed.

  
-
-

Returns

-

SignonSecurityContext item.

-

[transfer full]

-
-

signon_security_context_free ()

-
void
-signon_security_context_free (SignonSecurityContext *ctx);
-

Frees a security context item.

+

signon_security_context_copy ()

+
SignonSecurityContext *
+signon_security_context_copy (const SignonSecurityContext *src_ctx);
+

Copy a security context item.

Parameters

@@ -303,21 +291,27 @@ signon_security_context_free ( - - + +

ctx

SignonSecurityContext to be freed.

src_ctx

source security context to copy.

  
+
+

Returns

+

a copy of the SignonSecurityContext item.

+

[transfer full]

+
-

signon_security_context_get_application_context ()

-
const gchar *
-signon_security_context_get_application_context
-                               (const SignonSecurityContext *ctx);
-

Get the application context part (such as script name or a web page) of -the SignonSecurityContext.

+

signon_security_context_set_system_context ()

+
void
+signon_security_context_set_system_context
+                               (SignonSecurityContext *ctx,
+                                const gchar *system_context);
+

Sets the system context part (such as SMACK label or MSSF token) of the +SignonSecurityContext.

Parameters

@@ -326,18 +320,20 @@ the - + + - + + + + + + +

ctx

SignonSecurityContext item.

  

system_context

system security context.

 
-
-

Returns

-

application context.

-

[transfer none]

-
@@ -370,12 +366,13 @@ signon_security_context_get_system_context
-

signon_security_context_list_build_variant ()

-
GVariant *
-signon_security_context_list_build_variant
-                               (const SignonSecurityContextList *list);
-

Builds a GVariant of type "a(ss)" from a GList of SignonSecurityContext -items.

+

signon_security_context_set_application_context ()

+
void
+signon_security_context_set_application_context
+                               (SignonSecurityContext *ctx,
+                                const gchar *application_context);
+

Sets the application context part (such as a script name or a web page) of +the SignonSecurityContext.

Parameters

@@ -384,25 +381,29 @@ items.

- - - + + + + - + + + + + + +

list

SignonSecurityContextList item.

ctx

SignonSecurityContext item.

  

application_context

application security context.

 
-
-

Returns

-

GVariant construct of a SignonSecurityContextList.

-

[transfer full]

-
-

signon_security_context_list_copy ()

-
SignonSecurityContextList *
-signon_security_context_list_copy (const SignonSecurityContextList *src_list);
-

Copies a GList of SignonSecurityContext items.

+

signon_security_context_get_application_context ()

+
const gchar *
+signon_security_context_get_application_context
+                               (const SignonSecurityContext *ctx);
+

Get the application context part (such as script name or a web page) of +the SignonSecurityContext.

Parameters

@@ -412,26 +413,24 @@ signon_security_context_list_copy (const - - + +

src_list

source SignonSecurityContextList.

ctx

SignonSecurityContext item.

  

Returns

-

SignonSecurityContextList item.

-

[transfer full]

+

application context.

+

[transfer none]

-

signon_security_context_list_deconstruct_variant ()

-
SignonSecurityContextList *
-signon_security_context_list_deconstruct_variant
-                               (GVariant *variant);
-

Builds a GList of SignonSecurityContext items from a GVariant of type -"a(ss)".

+

signon_security_context_build_variant ()

+
GVariant *
+signon_security_context_build_variant (const SignonSecurityContext *ctx);
+

Build a GVariant of type "(ss)" from a SignonSecurityContext item.

Parameters

@@ -441,24 +440,25 @@ signon_security_context_list_deconstruct_variant - - + +

variant

GVariant item with a list of security context tuples.

ctx

SignonSecurityContext item.

  

Returns

-

SignonSecurityContextList item.

+

GVariant construct of a SignonSecurityContext.

[transfer full]

-

signon_security_context_list_free ()

-
void
-signon_security_context_list_free (SignonSecurityContextList *seclist);
-

Frees all items and the GList of SignonSecurityContext.

+

signon_security_context_deconstruct_variant ()

+
SignonSecurityContext *
+signon_security_context_deconstruct_variant
+                               (GVariant *variant);
+

Builds a SignonSecurityContext item from a GVariant of type "(ss)".

Parameters

@@ -468,33 +468,55 @@ signon_security_context_list_free ( - - - + + +

seclist

SignonSecurityContextList item.

[transfer full]

variant

GVariant item with a SignonSecurityContext construct.

 
+
+

Returns

+

SignonSecurityContext item.

+

[transfer full]

+
-

signon_security_context_new ()

-
SignonSecurityContext *
-signon_security_context_new ();
-

Allocates a new security context item.

+

signon_security_context_list_build_variant ()

+
GVariant *
+signon_security_context_list_build_variant
+                               (const SignonSecurityContextList *list);
+

Builds a GVariant of type "a(ss)" from a GList of SignonSecurityContext +items.

-

Returns

-

allocated SignonSecurityContext.

+

Parameters

+
+++++ + + + + + +

list

SignonSecurityContextList item.

 
+
+
+

Returns

+

GVariant construct of a SignonSecurityContextList.

[transfer full]

-

signon_security_context_new_from_values ()

-
SignonSecurityContext *
-signon_security_context_new_from_values
-                               (const gchar *system_context,
-                                const gchar *application_context);
-

Allocates and initializes a new security context item.

+

signon_security_context_list_deconstruct_variant ()

+
SignonSecurityContextList *
+signon_security_context_list_deconstruct_variant
+                               (GVariant *variant);
+

Builds a GList of SignonSecurityContext items from a GVariant of type +"a(ss)".

Parameters

@@ -503,35 +525,25 @@ signon_security_context_new_from_values - - - - - - - - - + + + - - +

system_context

system security context (such as SMACK/MSSF label/token).

 

application_context

application security context (such as a script name).

variant

GVariant item with a list of security context tuples.

  

Returns

-

allocated SignonSecurityContext.

+

SignonSecurityContextList item.

[transfer full]

-

signon_security_context_set_application_context ()

-
void
-signon_security_context_set_application_context
-                               (SignonSecurityContext *ctx,
-                                const gchar *application_context);
-

Sets the application context part (such as a script name or a web page) of -the SignonSecurityContext.

+

signon_security_context_list_copy ()

+
SignonSecurityContextList *
+signon_security_context_list_copy (const SignonSecurityContextList *src_list);
+

Copies a GList of SignonSecurityContext items.

Parameters

@@ -540,30 +552,25 @@ the - - - - - - - - - + + + - - +

ctx

SignonSecurityContext item.

 

application_context

application security context.

src_list

source SignonSecurityContextList.

  
+
+

Returns

+

SignonSecurityContextList item.

+

[transfer full]

+
-

signon_security_context_set_system_context ()

+

signon_security_context_list_free ()

void
-signon_security_context_set_system_context
-                               (SignonSecurityContext *ctx,
-                                const gchar *system_context);
-

Sets the system context part (such as SMACK label or MSSF token) of the -SignonSecurityContext.

+signon_security_context_list_free (SignonSecurityContextList *seclist); +

Frees all items and the GList of SignonSecurityContext.

Parameters

@@ -572,18 +579,11 @@ signon_security_context_set_system_context - - - - - - - - - - - - + + + + +

ctx

SignonSecurityContext item.

 

system_context

system security context.

 

seclist

SignonSecurityContextList item.

[transfer full]
diff --git a/docs/reference/html/api-index-deprecated.html b/docs/reference/html/api-index-deprecated.html index c5ffbdc..4e88678 100644 --- a/docs/reference/html/api-index-deprecated.html +++ b/docs/reference/html/api-index-deprecated.html @@ -31,6 +31,10 @@ signon_auth_session_process, function in SignonAuthSession
+
+signon_auth_session_query_available_mechanisms, function in SignonAuthSession +
+
diff --git a/docs/reference/html/index.sgml b/docs/reference/html/index.sgml index 55ce18a..b51411d 100644 --- a/docs/reference/html/index.sgml +++ b/docs/reference/html/index.sgml @@ -8,18 +8,18 @@ - - + + - - + + - - + + @@ -28,33 +28,33 @@ - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - + + + @@ -66,54 +66,54 @@ - - + - - + - + + + - - - - - - - + + + + + - - + + + + - - - + + + - + - - - + + - + + + + + + - + - - - - @@ -125,29 +125,29 @@ - - - - + + + + - + - - - - + - + + + - + + + - diff --git a/docs/reference/html/libgsignon-glib.devhelp2 b/docs/reference/html/libgsignon-glib.devhelp2 index 7f0b2b4..f0db0f5 100644 --- a/docs/reference/html/libgsignon-glib.devhelp2 +++ b/docs/reference/html/libgsignon-glib.devhelp2 @@ -25,111 +25,111 @@ - - + + - - - + + - + - - - - + - - - - - - + + + + + + + + + + - - - - - + + + + - - + + + - - + - - + - + + + - - - - - - - + + + + + - - + + + + - - - - + + + - - - + + + - + + + + + + - + - - - - - - - - + + + + - - - - - + + - + + + - + + + - diff --git a/docs/reference/libgsignon-glib-sections.txt b/docs/reference/libgsignon-glib-sections.txt index 2307d7a..7b614a2 100644 --- a/docs/reference/libgsignon-glib-sections.txt +++ b/docs/reference/libgsignon-glib-sections.txt @@ -1,17 +1,17 @@
signon-auth-service SignonAuthService -SignonAuthService SignonAuthServiceClass -SignonIdentityFilter +SignonAuthService +SignonQueryMethodsCb +SignonQueryMechanismCb SignonIdentityList +SignonIdentityFilter SignonQueryIdentitiesCb -SignonQueryMechanismCb -SignonQueryMethodsCb signon_auth_service_new -signon_auth_service_query_identities -signon_auth_service_query_mechanisms signon_auth_service_query_methods +signon_auth_service_query_mechanisms +signon_auth_service_query_identities SIGNON_AUTH_SERVICE SIGNON_AUTH_SERVICE_CLASS @@ -26,28 +26,28 @@ signon_auth_service_get_type
signon-auth-session SignonAuthSession -SIGNON_SESSION_DATA_CAPTION -SIGNON_SESSION_DATA_PROXY -SIGNON_SESSION_DATA_REALM -SIGNON_SESSION_DATA_RENEW_TOKEN +SIGNON_SESSION_DATA_USERNAME SIGNON_SESSION_DATA_SECRET -SIGNON_SESSION_DATA_TIMEOUT +SIGNON_SESSION_DATA_REALM +SIGNON_SESSION_DATA_PROXY +SignonSessionDataUiPolicy SIGNON_SESSION_DATA_UI_POLICY -SIGNON_SESSION_DATA_USERNAME +SIGNON_SESSION_DATA_CAPTION +SIGNON_SESSION_DATA_TIMEOUT SIGNON_SESSION_DATA_WINDOW_ID +SIGNON_SESSION_DATA_RENEW_TOKEN SignonAuthSession SignonAuthSessionClass -SignonAuthSessionProcessCb -SignonAuthSessionQueryAvailableMechanismsCb -SignonSessionDataUiPolicy -signon_auth_session_cancel -signon_auth_session_get_method signon_auth_session_new signon_auth_session_new_for_identity +signon_auth_session_get_method +SignonAuthSessionQueryAvailableMechanismsCb +signon_auth_session_query_available_mechanisms +SignonAuthSessionProcessCb signon_auth_session_process signon_auth_session_process_async signon_auth_session_process_finish -signon_auth_session_query_available_mechanisms +signon_auth_session_cancel SIGNON_AUTH_SESSION SIGNON_AUTH_SESSION_CLASS @@ -67,39 +67,34 @@ signon_error_quark
-signon-glib - -
- -
signon-identity SignonIdentity -SignonIdentity SignonIdentityClass -SignonIdentityInfoCb -SignonIdentityReferenceAddedCb -SignonIdentityReferenceRemovedCb +SignonIdentity +SignonIdentityVoidCb SignonIdentityRemovedCb -SignonIdentitySessionReadyCb SignonIdentitySignedOutCb -SignonIdentityStoreCredentialsCb -SignonIdentityVerifyCb -SignonIdentityVoidCb -signon_identity_add_reference -signon_identity_create_session -signon_identity_get_auth_session -signon_identity_get_last_error -signon_identity_new +SignonIdentityReferenceAddedCb +SignonIdentityReferenceRemovedCb signon_identity_new_from_db -signon_identity_new_with_context +signon_identity_new signon_identity_new_with_context_from_db +signon_identity_new_with_context +signon_identity_get_last_error +signon_identity_create_session +SignonIdentityStoreCredentialsCb +signon_identity_store_credentials_with_info +signon_identity_store_credentials_with_args +SignonIdentityVerifyCb +signon_identity_verify_secret +SignonIdentityInfoCb signon_identity_query_info signon_identity_remove -signon_identity_remove_reference signon_identity_signout -signon_identity_store_credentials_with_args -signon_identity_store_credentials_with_info -signon_identity_verify_secret +signon_identity_add_reference +signon_identity_remove_reference +SignonIdentitySessionReadyCb +signon_identity_get_auth_session SIGNON_IDENTITY SIGNON_IDENTITY_CLASS @@ -113,33 +108,33 @@ signon_identity_get_type
signon-identity-info -SignonIdentityInfo SignonIdentityType -signon_identity_info_access_control_list_append -signon_identity_info_copy +signon_identity_info_new signon_identity_info_free -signon_identity_info_get_access_control_list -signon_identity_info_get_caption +signon_identity_info_copy signon_identity_info_get_id -signon_identity_info_get_identity_type +signon_identity_info_get_username +signon_identity_info_get_storing_secret +signon_identity_info_get_caption signon_identity_info_get_methods -signon_identity_info_get_owner signon_identity_info_get_realms -signon_identity_info_get_storing_secret -signon_identity_info_get_username -signon_identity_info_new -signon_identity_info_own_methods -signon_identity_info_remove_method -signon_identity_info_set_access_control_list +signon_identity_info_get_owner +signon_identity_info_get_access_control_list +signon_identity_info_get_identity_type +signon_identity_info_set_username +signon_identity_info_set_secret signon_identity_info_set_caption -signon_identity_info_set_identity_type -signon_identity_info_set_method signon_identity_info_set_methods +signon_identity_info_own_methods +signon_identity_info_set_method +signon_identity_info_remove_method +signon_identity_info_set_realms signon_identity_info_set_owner signon_identity_info_set_owner_from_values -signon_identity_info_set_realms -signon_identity_info_set_secret -signon_identity_info_set_username +signon_identity_info_set_access_control_list +signon_identity_info_access_control_list_append +signon_identity_info_set_identity_type +SignonIdentityInfo signon_identity_info_get_type
@@ -148,20 +143,20 @@ signon_identity_info_get_type signon-security-context SignonSecurityContext SignonSecurityContextList -signon_security_context_build_variant -signon_security_context_copy -signon_security_context_deconstruct_variant +signon_security_context_new +signon_security_context_new_from_values signon_security_context_free -signon_security_context_get_application_context +signon_security_context_copy +signon_security_context_set_system_context signon_security_context_get_system_context +signon_security_context_set_application_context +signon_security_context_get_application_context +signon_security_context_build_variant +signon_security_context_deconstruct_variant signon_security_context_list_build_variant -signon_security_context_list_copy signon_security_context_list_deconstruct_variant +signon_security_context_list_copy signon_security_context_list_free -signon_security_context_new -signon_security_context_new_from_values -signon_security_context_set_application_context -signon_security_context_set_system_context signon_security_context_get_type
diff --git a/examples/Makefile.in b/examples/Makefile.in index c1e9983..0ae54c1 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,7 +80,8 @@ build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = gsso-example$(EXEEXT) subdir = examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -59,6 +104,19 @@ gsso_example_DEPENDENCIES = $(am__DEPENDENCIES_1) \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -71,22 +129,40 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(gsso_example_SOURCES) DIST_SOURCES = $(gsso_example_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -121,6 +197,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -282,14 +359,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -310,7 +392,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -323,6 +406,7 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + gsso-example$(EXEEXT): $(gsso_example_OBJECTS) $(gsso_example_DEPENDENCIES) $(EXTRA_gsso_example_DEPENDENCIES) @rm -f gsso-example$(EXEEXT) $(AM_V_CCLD)$(LINK) $(gsso_example_OBJECTS) $(gsso_example_LDADD) $(LIBS) @@ -379,26 +463,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -410,15 +483,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -427,6 +496,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -570,19 +654,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/gtk-doc.make b/gtk-doc.make index 9841de4..e791656 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -49,9 +49,13 @@ REPORT_FILES = \ $(DOC_MODULE)-undeclared.txt \ $(DOC_MODULE)-unused.txt -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) +gtkdoc-check.test: Makefile + $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ + echo "$(GTKDOC_CHECK_PATH) || exit 1" >> $@; \ + chmod +x $@ + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) gtkdoc-check.test -if ENABLE_GTK_DOC if GTK_DOC_BUILD_HTML HTML_BUILD_STAMP=html-build.stamp else @@ -63,9 +67,11 @@ else PDF_BUILD_STAMP= endif -all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) -else -all-local: +all-gtk-doc: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +.PHONY: all-gtk-doc + +if ENABLE_GTK_DOC +all-local: all-gtk-doc endif docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) @@ -74,31 +80,42 @@ $(REPORT_FILES): sgml-build.stamp #### setup #### +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; + setup-build.stamp: - -@if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - echo ' DOC Preparing build'; \ + -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ - cp -pu $(abs_srcdir)/$$file $(abs_builddir)/ || true; \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ fi - @touch setup-build.stamp + $(AM_V_at)touch setup-build.stamp #### scan #### -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo ' DOC Scanning header files' - @_source_dir='' ; \ +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; + +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; + +scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) + $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - echo " DOC Introspecting gobjects"; \ + $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ @@ -113,32 +130,41 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + $(AM_V_at)touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true #### xml #### +GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML_0=@echo " DOC Building XML"; + sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) - @echo ' DOC Building XML' - @_source_dir='' ; \ + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) - @touch sgml-build.stamp + $(AM_V_at)touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true #### html #### +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; + +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; + html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building HTML' - @rm -rf html - @mkdir html - @mkhtml_options=""; \ + $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -159,16 +185,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) cp $(abs_builddir)/$$file $(abs_builddir)/html; \ fi; \ done; - @echo ' DOC Fixing cross-references' - @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp + $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + $(AM_V_at)touch html-build.stamp #### pdf #### +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; + pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo ' DOC Building PDF' - @rm -f $(DOC_MODULE).pdf - @mkpdf_options=""; \ + $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ + mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ if test "$(?)" = "0"; then \ if test "x$(V)" = "x1"; then \ @@ -185,13 +213,16 @@ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) done; \ fi; \ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_options $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + $(AM_V_at)touch pdf-build.stamp ############## clean-local: @rm -f *~ *.bak @rm -rf .libs + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ + rm -f $(DOC_MODULE).types; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ @@ -200,7 +231,7 @@ distclean-local: rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ fi -maintainer-clean-local: clean +maintainer-clean-local: @rm -rf xml html install-data-local: @@ -236,15 +267,17 @@ uninstall-local: # # Require gtk-doc when making dist # -if ENABLE_GTK_DOC -dist-check-gtkdoc: +if HAVE_GTK_DOC +dist-check-gtkdoc: docs else dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" + @echo "*** gtk-doc is needed to run 'make dist'. ***" + @echo "*** gtk-doc was not found when 'configure' ran. ***" + @echo "*** please install gtk-doc and rerun 'configure'. ***" @false endif -dist-hook: dist-check-gtkdoc dist-hook-local +dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local @mkdir $(distdir)/html @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ diff --git a/libgsignon-glib/Makefile.am b/libgsignon-glib/Makefile.am index 5cb8437..b27d525 100644 --- a/libgsignon-glib/Makefile.am +++ b/libgsignon-glib/Makefile.am @@ -6,7 +6,6 @@ libgsignon_glib_la_CPPFLAGS = \ -I$(srcdir) \ -I$(top_builddir) \ -I$(builddir) \ - -I$(top_srcdir)/libgsignon-glib \ $(DEPS_CFLAGS) \ -Wall -Werror libgsignon_glib_la_LIBADD = $(DEPS_LIBS) @@ -14,7 +13,26 @@ libgsignon_glib_la_LDFLAGS = \ -version-info 1:0:0 \ -export-symbols-regex '^signon_' +nodist_libgsignon_glib_la_SOURCES = \ + signon-marshal.c \ + signon-marshal.h \ + signon-enum-types.h \ + signon-enum-types.c \ + signon-errors-enum.c \ + sso-auth-service-gen.c \ + sso-auth-service-gen.h \ + sso-auth-session-gen.c \ + sso-auth-session-gen.h \ + sso-identity-gen.c \ + sso-identity-gen.h \ + stamp-signon-enum-types.h + +BUILT_SOURCES = \ + $(nodist_libgsignon_glib_la_SOURCES) \ + signon-errors-map.c + CLEANFILES = \ + $(BUILT_SOURCES) \ sso-auth-service-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml \ sso-auth-session-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml \ sso-identity-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.Identity.xml @@ -39,20 +57,7 @@ libgsignon_glib_la_SOURCES = \ signon-security-context.h \ signon-security-context.c \ sso-auth-service.c \ - sso-auth-service.h \ - signon-marshal.c \ - signon-marshal.h \ - signon-enum-types.h \ - signon-enum-types.c \ - signon-errors-enum.c \ - sso-auth-service-gen.c \ - sso-auth-service-gen.h \ - sso-auth-session-gen.c \ - sso-auth-session-gen.h \ - sso-identity-gen.c \ - sso-identity-gen.h \ - stamp-signon-enum-types.h \ - signon-errors-map.c + sso-auth-service.h libgsignon_glib_includedir = $(includedir)/libgsignon-glib libgsignon_glib_include_HEADERS = \ @@ -77,6 +82,84 @@ libgsignon_glib_headers_with_enums = \ # default is /usr/share/dbus-1/interfaces INTERFACES_DIR = $(top_srcdir)/libgsignon-glib/interfaces +sso-auth-service-gen.h sso-auth-service-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml + $(AM_V_GEN)gdbus-codegen \ + --generate-c-code sso-auth-service-gen \ + --generate-docbook sso-auth-service-gen-doc \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \ + $< + +sso-auth-session-gen.h sso-auth-session-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml + $(AM_V_GEN)gdbus-codegen \ + --generate-c-code sso-auth-session-gen \ + --generate-docbook sso-auth-session-gen-doc \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \ + $< + +sso-identity-gen.h sso-identity-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml + $(AM_V_GEN)gdbus-codegen \ + --generate-c-code sso-identity-gen \ + --generate-docbook sso-identity-gen-doc \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity \ + $< + +signon-marshal.h: signon-marshal.list Makefile + $(AM_V_GEN)glib-genmarshal --header --prefix=_signon_marshal $< > $@ + +signon-marshal.c: signon-marshal.list Makefile + $(AM_V_GEN)glib-genmarshal --body --prefix=_signon_marshal $< > $@ + +signon-enum-types.h: stamp-signon-enum-types.h + $(AM_V_at)true + +stamp-signon-enum-types.h: Makefile \ + $(libgsignon_glib_headers_with_enums) signon-errors.h + $(AM_V_GEN)( cd $(srcdir) && glib-mkenums \ + --fhead "#ifndef __SIGNON_ENUM_TYPES_H__\n#define __SIGNON_ENUM_TYPES_H__\n#include \n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define SIGNON_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __SIGNON_ENUM_TYPES_H__ */" \ + $(libgsignon_glib_headers_with_enums) signon-errors.h ) >> stamp-xgen-geth \ + && (cmp -s stamp-xgen-geth signon-enum-types.h || cp stamp-xgen-geth signon-enum-types.h ) \ + && rm -f stamp-xgen-geth \ + && echo timestamp > $(@F) + +signon-enum-types.c: Makefile $(libgsignon_glib_headers_with_enums) + $(AM_V_GEN)( cd $(srcdir) && glib-mkenums \ + --fhead "#include \"signon-enum-types.h\"\n" \ + --fhead "#include \"signon-identity-info.h\"\n" \ + --fhead "#include \"signon-auth-session.h\"\n" \ + --fhead "#define g_intern_static_string(s) (s)\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --ftail "\n#define __SIGNON_ENUM_TYPES_C__\n" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ + $(libgsignon_glib_headers_with_enums) ) > enum-xgen-getc \ + && cp enum-xgen-getc signon-enum-types.c \ + && rm -f enum-xgen-getc + +signon-errors-enum.c: Makefile signon-errors.h + $(AM_V_GEN)( cd $(srcdir) && glib-mkenums \ + --fhead "#include \"signon-enum-types.h\"\n#include \"signon-errors.h\"\n#include \"signon-internals.h\"\n#define g_intern_static_string(s) (s)\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --ftail "\n#define __SIGNON_ENUM_TYPES_C__\n" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, SED@VALUENAME@, \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ + signon-errors.h ) | \ + $(SED) -e 's/SEDSIGNON_ERROR_\([^,]*\)/SIGNOND_\1_ERR_NAME/' \ + > errors-xgen-getc \ + && cp errors-xgen-getc signon-errors-enum.c \ + && rm -f errors-xgen-getc + +signon-errors-map.c: Makefile signon-errors.h + $(AM_V_GEN)( cd $(srcdir) && \ + echo "static const GDBusErrorEntry signon_error_entries[] = {" && \ + grep "^ *SIGNON_ERROR_" signon-errors.h | \ + $(SED) -e 's/SIGNON_ERROR_\([A-Z_0-9]*\).*/{ SIGNON_ERROR_\1, SIGNOND_\1_ERR_NAME },/' && \ + echo -e "};\n" ) > signon-errors-map.c + dist_noinst_DATA = \ signon-marshal.list \ stamp-signon-enum-types.h diff --git a/libgsignon-glib/Makefile.in b/libgsignon-glib/Makefile.in index 5cf4fa1..49d3d86 100644 --- a/libgsignon-glib/Makefile.in +++ b/libgsignon-glib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -18,6 +17,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,8 +83,9 @@ host_triplet = @host@ @HAVE_INTROSPECTION_TRUE@am__append_1 = gSignon-1.0.gir @HAVE_INTROSPECTION_TRUE@am__append_2 = $(gir_DATA) $(typelib_DATA) subdir = libgsignon-glib -DIST_COMMON = $(dist_noinst_DATA) $(libgsignon_glib_include_HEADERS) \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp $(dist_noinst_DATA) \ + $(libgsignon_glib_include_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -96,22 +141,36 @@ am_libgsignon_glib_la_OBJECTS = \ libgsignon_glib_la-signon-errors.lo \ libgsignon_glib_la-signon-utils.lo \ libgsignon_glib_la-signon-security-context.lo \ - libgsignon_glib_la-sso-auth-service.lo \ + libgsignon_glib_la-sso-auth-service.lo +nodist_libgsignon_glib_la_OBJECTS = \ libgsignon_glib_la-signon-marshal.lo \ libgsignon_glib_la-signon-enum-types.lo \ libgsignon_glib_la-signon-errors-enum.lo \ libgsignon_glib_la-sso-auth-service-gen.lo \ libgsignon_glib_la-sso-auth-session-gen.lo \ - libgsignon_glib_la-sso-identity-gen.lo \ - libgsignon_glib_la-signon-errors-map.lo -libgsignon_glib_la_OBJECTS = $(am_libgsignon_glib_la_OBJECTS) + libgsignon_glib_la-sso-identity-gen.lo +libgsignon_glib_la_OBJECTS = $(am_libgsignon_glib_la_OBJECTS) \ + $(nodist_libgsignon_glib_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = libgsignon_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libgsignon_glib_la_LDFLAGS) \ $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -124,25 +183,44 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libgsignon_glib_la_SOURCES) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = $(libgsignon_glib_la_SOURCES) \ + $(nodist_libgsignon_glib_la_SOURCES) DIST_SOURCES = $(libgsignon_glib_la_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(dbusinterfaces_DATA) $(dist_noinst_DATA) $(gir_DATA) \ $(typelib_DATA) HEADERS = $(libgsignon_glib_include_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -177,6 +255,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -301,7 +380,6 @@ libgsignon_glib_la_CPPFLAGS = \ -I$(srcdir) \ -I$(top_builddir) \ -I$(builddir) \ - -I$(top_srcdir)/libgsignon-glib \ $(DEPS_CFLAGS) \ -Wall -Werror @@ -310,7 +388,26 @@ libgsignon_glib_la_LDFLAGS = \ -version-info 1:0:0 \ -export-symbols-regex '^signon_' -CLEANFILES = sso-auth-service-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml \ +nodist_libgsignon_glib_la_SOURCES = \ + signon-marshal.c \ + signon-marshal.h \ + signon-enum-types.h \ + signon-enum-types.c \ + signon-errors-enum.c \ + sso-auth-service-gen.c \ + sso-auth-service-gen.h \ + sso-auth-session-gen.c \ + sso-auth-session-gen.h \ + sso-identity-gen.c \ + sso-identity-gen.h \ + stamp-signon-enum-types.h + +BUILT_SOURCES = \ + $(nodist_libgsignon_glib_la_SOURCES) \ + signon-errors-map.c + +CLEANFILES = $(BUILT_SOURCES) \ + sso-auth-service-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml \ sso-auth-session-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml \ sso-identity-gen-doc-com.google.code.AccountsSSO.gSingleSignOn.Identity.xml \ $(am__append_2) @@ -334,20 +431,7 @@ libgsignon_glib_la_SOURCES = \ signon-security-context.h \ signon-security-context.c \ sso-auth-service.c \ - sso-auth-service.h \ - signon-marshal.c \ - signon-marshal.h \ - signon-enum-types.h \ - signon-enum-types.c \ - signon-errors-enum.c \ - sso-auth-service-gen.c \ - sso-auth-service-gen.h \ - sso-auth-session-gen.c \ - sso-auth-session-gen.h \ - sso-identity-gen.c \ - sso-identity-gen.h \ - stamp-signon-enum-types.h \ - signon-errors-map.c + sso-auth-service.h libgsignon_glib_includedir = $(includedir)/libgsignon-glib libgsignon_glib_include_HEADERS = \ @@ -420,7 +504,8 @@ dbusinterfaces_DATA = \ $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml EXTRA_DIST = interfaces -all: all-am +all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj @@ -454,9 +539,9 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -464,6 +549,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -479,12 +566,15 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + libgsignon-glib.la: $(libgsignon_glib_la_OBJECTS) $(libgsignon_glib_la_DEPENDENCIES) $(EXTRA_libgsignon_glib_la_DEPENDENCIES) $(AM_V_CCLD)$(libgsignon_glib_la_LINK) -rpath $(libdir) $(libgsignon_glib_la_OBJECTS) $(libgsignon_glib_la_LIBADD) $(LIBS) @@ -499,7 +589,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsignon_glib_la-signon-dbus-queue.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsignon_glib_la-signon-enum-types.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsignon_glib_la-signon-errors-enum.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsignon_glib_la-signon-errors-map.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsignon_glib_la-signon-errors.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsignon_glib_la-signon-identity-info.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgsignon_glib_la-signon-identity.Plo@am__quote@ @@ -640,13 +729,6 @@ libgsignon_glib_la-sso-identity-gen.lo: sso-identity-gen.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsignon_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgsignon_glib_la-sso-identity-gen.lo `test -f 'sso-identity-gen.c' || echo '$(srcdir)/'`sso-identity-gen.c -libgsignon_glib_la-signon-errors-map.lo: signon-errors-map.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsignon_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libgsignon_glib_la-signon-errors-map.lo -MD -MP -MF $(DEPDIR)/libgsignon_glib_la-signon-errors-map.Tpo -c -o libgsignon_glib_la-signon-errors-map.lo `test -f 'signon-errors-map.c' || echo '$(srcdir)/'`signon-errors-map.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgsignon_glib_la-signon-errors-map.Tpo $(DEPDIR)/libgsignon_glib_la-signon-errors-map.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signon-errors-map.c' object='libgsignon_glib_la-signon-errors-map.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgsignon_glib_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgsignon_glib_la-signon-errors-map.lo `test -f 'signon-errors-map.c' || echo '$(srcdir)/'`signon-errors-map.c - mostlyclean-libtool: -rm -f *.lo @@ -654,8 +736,11 @@ clean-libtool: -rm -rf .libs _libs install-dbusinterfacesDATA: $(dbusinterfaces_DATA) @$(NORMAL_INSTALL) - test -z "$(dbusinterfacesdir)" || $(MKDIR_P) "$(DESTDIR)$(dbusinterfacesdir)" @list='$(dbusinterfaces_DATA)'; test -n "$(dbusinterfacesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(dbusinterfacesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(dbusinterfacesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -672,8 +757,11 @@ uninstall-dbusinterfacesDATA: dir='$(DESTDIR)$(dbusinterfacesdir)'; $(am__uninstall_files_from_dir) install-girDATA: $(gir_DATA) @$(NORMAL_INSTALL) - test -z "$(girdir)" || $(MKDIR_P) "$(DESTDIR)$(girdir)" @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -690,8 +778,11 @@ uninstall-girDATA: dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) install-typelibDATA: $(typelib_DATA) @$(NORMAL_INSTALL) - test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)" @list='$(typelib_DATA)'; test -n "$(typelibdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(typelibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(typelibdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -708,8 +799,11 @@ uninstall-typelibDATA: dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir) install-libgsignon_glib_includeHEADERS: $(libgsignon_glib_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(libgsignon_glib_includedir)" || $(MKDIR_P) "$(DESTDIR)$(libgsignon_glib_includedir)" @list='$(libgsignon_glib_include_HEADERS)'; test -n "$(libgsignon_glib_includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libgsignon_glib_includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libgsignon_glib_includedir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -725,26 +819,15 @@ uninstall-libgsignon_glib_includeHEADERS: files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(libgsignon_glib_includedir)'; $(am__uninstall_files_from_dir) -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -756,15 +839,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -773,6 +852,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -808,13 +902,15 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am -check: check-am +check: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) installdirs: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libgsignon_glib_includedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done -install: install-am +install: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am install-data: install-data-am uninstall: uninstall-am @@ -845,6 +941,7 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ @@ -919,27 +1016,106 @@ uninstall-am: uninstall-dbusinterfacesDATA uninstall-girDATA \ uninstall-libLTLIBRARIES \ uninstall-libgsignon_glib_includeHEADERS uninstall-typelibDATA -.MAKE: install-am install-strip +.MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dbusinterfacesDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-girDATA install-html \ - install-html-am install-info install-info-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dbusinterfacesDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-girDATA \ + install-html install-html-am install-info install-info-am \ install-libLTLIBRARIES install-libgsignon_glib_includeHEADERS \ install-man install-pdf install-pdf-am install-ps \ install-ps-am install-strip install-typelibDATA installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-dbusinterfacesDATA \ - uninstall-girDATA uninstall-libLTLIBRARIES \ + tags tags-am uninstall uninstall-am \ + uninstall-dbusinterfacesDATA uninstall-girDATA \ + uninstall-libLTLIBRARIES \ uninstall-libgsignon_glib_includeHEADERS uninstall-typelibDATA +sso-auth-service-gen.h sso-auth-service-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthService.xml + $(AM_V_GEN)gdbus-codegen \ + --generate-c-code sso-auth-service-gen \ + --generate-docbook sso-auth-service-gen-doc \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthService" org.gtk.GDBus.C.Name SsoAuthService \ + $< + +sso-auth-session-gen.h sso-auth-session-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.AuthSession.xml + $(AM_V_GEN)gdbus-codegen \ + --generate-c-code sso-auth-session-gen \ + --generate-docbook sso-auth-session-gen-doc \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.AuthSession" org.gtk.GDBus.C.Name SsoAuthSession \ + $< + +sso-identity-gen.h sso-identity-gen.c: $(INTERFACES_DIR)/com.google.code.AccountsSSO.gSingleSignOn.Identity.xml + $(AM_V_GEN)gdbus-codegen \ + --generate-c-code sso-identity-gen \ + --generate-docbook sso-identity-gen-doc \ + --annotate "com.google.code.AccountsSSO.gSingleSignOn.Identity" org.gtk.GDBus.C.Name SsoIdentity \ + $< + +signon-marshal.h: signon-marshal.list Makefile + $(AM_V_GEN)glib-genmarshal --header --prefix=_signon_marshal $< > $@ + +signon-marshal.c: signon-marshal.list Makefile + $(AM_V_GEN)glib-genmarshal --body --prefix=_signon_marshal $< > $@ + +signon-enum-types.h: stamp-signon-enum-types.h + $(AM_V_at)true + +stamp-signon-enum-types.h: Makefile \ + $(libgsignon_glib_headers_with_enums) signon-errors.h + $(AM_V_GEN)( cd $(srcdir) && glib-mkenums \ + --fhead "#ifndef __SIGNON_ENUM_TYPES_H__\n#define __SIGNON_ENUM_TYPES_H__\n#include \n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define SIGNON_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* __SIGNON_ENUM_TYPES_H__ */" \ + $(libgsignon_glib_headers_with_enums) signon-errors.h ) >> stamp-xgen-geth \ + && (cmp -s stamp-xgen-geth signon-enum-types.h || cp stamp-xgen-geth signon-enum-types.h ) \ + && rm -f stamp-xgen-geth \ + && echo timestamp > $(@F) + +signon-enum-types.c: Makefile $(libgsignon_glib_headers_with_enums) + $(AM_V_GEN)( cd $(srcdir) && glib-mkenums \ + --fhead "#include \"signon-enum-types.h\"\n" \ + --fhead "#include \"signon-identity-info.h\"\n" \ + --fhead "#include \"signon-auth-session.h\"\n" \ + --fhead "#define g_intern_static_string(s) (s)\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --ftail "\n#define __SIGNON_ENUM_TYPES_C__\n" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ + $(libgsignon_glib_headers_with_enums) ) > enum-xgen-getc \ + && cp enum-xgen-getc signon-enum-types.c \ + && rm -f enum-xgen-getc + +signon-errors-enum.c: Makefile signon-errors.h + $(AM_V_GEN)( cd $(srcdir) && glib-mkenums \ + --fhead "#include \"signon-enum-types.h\"\n#include \"signon-errors.h\"\n#include \"signon-internals.h\"\n#define g_intern_static_string(s) (s)\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --ftail "\n#define __SIGNON_ENUM_TYPES_C__\n" \ + --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ + --vprod " { @VALUENAME@, SED@VALUENAME@, \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (g_intern_static_string (\"@EnumName@\"), values);\n }\n return etype;\n}\n" \ + signon-errors.h ) | \ + $(SED) -e 's/SEDSIGNON_ERROR_\([^,]*\)/SIGNOND_\1_ERR_NAME/' \ + > errors-xgen-getc \ + && cp errors-xgen-getc signon-errors-enum.c \ + && rm -f errors-xgen-getc + +signon-errors-map.c: Makefile signon-errors.h + $(AM_V_GEN)( cd $(srcdir) && \ + echo "static const GDBusErrorEntry signon_error_entries[] = {" && \ + grep "^ *SIGNON_ERROR_" signon-errors.h | \ + $(SED) -e 's/SIGNON_ERROR_\([A-Z_0-9]*\).*/{ SIGNON_ERROR_\1, SIGNOND_\1_ERR_NAME },/' && \ + echo -e "};\n" ) > signon-errors-map.c + -include $(INTROSPECTION_MAKEFILE) @HAVE_INTROSPECTION_TRUE@gSignon-1.0.gir: libgsignon-glib.la diff --git a/libgsignon-glib/signon-enum-types.c b/libgsignon-glib/signon-enum-types.c deleted file mode 100644 index a7cf0fe..0000000 --- a/libgsignon-glib/signon-enum-types.c +++ /dev/null @@ -1,48 +0,0 @@ - - - -#include "signon-enum-types.h" -#include "signon-identity-info.h" -#include "signon-auth-session.h" -#define g_intern_static_string(s) (s) - -/* enumerations from "signon-auth-session.h" */ -GType -signon_session_data_ui_policy_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { SIGNON_POLICY_DEFAULT, "SIGNON_POLICY_DEFAULT", "default" }, - { SIGNON_POLICY_REQUEST_PASSWORD, "SIGNON_POLICY_REQUEST_PASSWORD", "request-password" }, - { SIGNON_POLICY_NO_USER_INTERACTION, "SIGNON_POLICY_NO_USER_INTERACTION", "no-user-interaction" }, - { SIGNON_POLICY_VALIDATION, "SIGNON_POLICY_VALIDATION", "validation" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static (g_intern_static_string ("SignonSessionDataUiPolicy"), values); - } - return etype; -} - -/* enumerations from "signon-identity-info.h" */ -GType -signon_identity_type_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GFlagsValue values[] = { - { SIGNON_IDENTITY_TYPE_OTHER, "SIGNON_IDENTITY_TYPE_OTHER", "other" }, - { SIGNON_IDENTITY_TYPE_APP, "SIGNON_IDENTITY_TYPE_APP", "app" }, - { SIGNON_IDENTITY_TYPE_WEB, "SIGNON_IDENTITY_TYPE_WEB", "web" }, - { SIGNON_IDENTITY_TYPE_NETWORK, "SIGNON_IDENTITY_TYPE_NETWORK", "network" }, - { 0, NULL, NULL } - }; - etype = g_flags_register_static (g_intern_static_string ("SignonIdentityType"), values); - } - return etype; -} - -#define __SIGNON_ENUM_TYPES_C__ - - - diff --git a/libgsignon-glib/signon-errors-enum.c b/libgsignon-glib/signon-errors-enum.c deleted file mode 100644 index 86fc74a..0000000 --- a/libgsignon-glib/signon-errors-enum.c +++ /dev/null @@ -1,61 +0,0 @@ - - - -#include "signon-enum-types.h" -#include "signon-errors.h" -#include "signon-internals.h" -#define g_intern_static_string(s) (s) - -/* enumerations from "signon-errors.h" */ -GType -signon_error_get_type (void) -{ - static GType etype = 0; - if (etype == 0) { - static const GEnumValue values[] = { - { SIGNON_ERROR_UNKNOWN, SIGNOND_UNKNOWN_ERR_NAME, "unknown" }, - { SIGNON_ERROR_INTERNAL_SERVER, SIGNOND_INTERNAL_SERVER_ERR_NAME, "internal-server" }, - { SIGNON_ERROR_INTERNAL_COMMUNICATION, SIGNOND_INTERNAL_COMMUNICATION_ERR_NAME, "internal-communication" }, - { SIGNON_ERROR_PERMISSION_DENIED, SIGNOND_PERMISSION_DENIED_ERR_NAME, "permission-denied" }, - { SIGNON_ERROR_METHOD_NOT_KNOWN, SIGNOND_METHOD_NOT_KNOWN_ERR_NAME, "method-not-known" }, - { SIGNON_ERROR_SERVICE_NOT_AVAILABLE, SIGNOND_SERVICE_NOT_AVAILABLE_ERR_NAME, "service-not-available" }, - { SIGNON_ERROR_INVALID_QUERY, SIGNOND_INVALID_QUERY_ERR_NAME, "invalid-query" }, - { SIGNON_ERROR_METHOD_NOT_AVAILABLE, SIGNOND_METHOD_NOT_AVAILABLE_ERR_NAME, "method-not-available" }, - { SIGNON_ERROR_IDENTITY_NOT_FOUND, SIGNOND_IDENTITY_NOT_FOUND_ERR_NAME, "identity-not-found" }, - { SIGNON_ERROR_STORE_FAILED, SIGNOND_STORE_FAILED_ERR_NAME, "store-failed" }, - { SIGNON_ERROR_REMOVE_FAILED, SIGNOND_REMOVE_FAILED_ERR_NAME, "remove-failed" }, - { SIGNON_ERROR_SIGNOUT_FAILED, SIGNOND_SIGNOUT_FAILED_ERR_NAME, "signout-failed" }, - { SIGNON_ERROR_IDENTITY_OPERATION_CANCELED, SIGNOND_IDENTITY_OPERATION_CANCELED_ERR_NAME, "identity-operation-canceled" }, - { SIGNON_ERROR_CREDENTIALS_NOT_AVAILABLE, SIGNOND_CREDENTIALS_NOT_AVAILABLE_ERR_NAME, "credentials-not-available" }, - { SIGNON_ERROR_REFERENCE_NOT_FOUND, SIGNOND_REFERENCE_NOT_FOUND_ERR_NAME, "reference-not-found" }, - { SIGNON_ERROR_MECHANISM_NOT_AVAILABLE, SIGNOND_MECHANISM_NOT_AVAILABLE_ERR_NAME, "mechanism-not-available" }, - { SIGNON_ERROR_MISSING_DATA, SIGNOND_MISSING_DATA_ERR_NAME, "missing-data" }, - { SIGNON_ERROR_INVALID_CREDENTIALS, SIGNOND_INVALID_CREDENTIALS_ERR_NAME, "invalid-credentials" }, - { SIGNON_ERROR_NOT_AUTHORIZED, SIGNOND_NOT_AUTHORIZED_ERR_NAME, "not-authorized" }, - { SIGNON_ERROR_WRONG_STATE, SIGNOND_WRONG_STATE_ERR_NAME, "wrong-state" }, - { SIGNON_ERROR_OPERATION_NOT_SUPPORTED, SIGNOND_OPERATION_NOT_SUPPORTED_ERR_NAME, "operation-not-supported" }, - { SIGNON_ERROR_NO_CONNECTION, SIGNOND_NO_CONNECTION_ERR_NAME, "no-connection" }, - { SIGNON_ERROR_NETWORK, SIGNOND_NETWORK_ERR_NAME, "network" }, - { SIGNON_ERROR_SSL, SIGNOND_SSL_ERR_NAME, "ssl" }, - { SIGNON_ERROR_RUNTIME, SIGNOND_RUNTIME_ERR_NAME, "runtime" }, - { SIGNON_ERROR_SESSION_CANCELED, SIGNOND_SESSION_CANCELED_ERR_NAME, "session-canceled" }, - { SIGNON_ERROR_TIMED_OUT, SIGNOND_TIMED_OUT_ERR_NAME, "timed-out" }, - { SIGNON_ERROR_USER_INTERACTION, SIGNOND_USER_INTERACTION_ERR_NAME, "user-interaction" }, - { SIGNON_ERROR_OPERATION_FAILED, SIGNOND_OPERATION_FAILED_ERR_NAME, "operation-failed" }, - { SIGNON_ERROR_ENCRYPTION_FAILED, SIGNOND_ENCRYPTION_FAILED_ERR_NAME, "encryption-failed" }, - { SIGNON_ERROR_TOS_NOT_ACCEPTED, SIGNOND_TOS_NOT_ACCEPTED_ERR_NAME, "tos-not-accepted" }, - { SIGNON_ERROR_FORGOT_PASSWORD, SIGNOND_FORGOT_PASSWORD_ERR_NAME, "forgot-password" }, - { SIGNON_ERROR_METHOD_OR_MECHANISM_NOT_ALLOWED, SIGNOND_METHOD_OR_MECHANISM_NOT_ALLOWED_ERR_NAME, "method-or-mechanism-not-allowed" }, - { SIGNON_ERROR_INCORRECT_DATE, SIGNOND_INCORRECT_DATE_ERR_NAME, "incorrect-date" }, - { SIGNON_ERROR_USER_ERROR, SIGNOND_USER_ERROR_ERR_NAME, "user-error" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static (g_intern_static_string ("SignonError"), values); - } - return etype; -} - -#define __SIGNON_ENUM_TYPES_C__ - - - diff --git a/libgsignon-glib/signon-errors-map.c b/libgsignon-glib/signon-errors-map.c deleted file mode 100644 index 7176c1b..0000000 --- a/libgsignon-glib/signon-errors-map.c +++ /dev/null @@ -1,43 +0,0 @@ -#include - -#include "signon-errors.h" -#include "signon-internals.h" - -static const GDBusErrorEntry signon_error_entries[] = { - { SIGNON_ERROR_UNKNOWN, SIGNOND_UNKNOWN_ERR_NAME }, - { SIGNON_ERROR_INTERNAL_SERVER, SIGNOND_INTERNAL_SERVER_ERR_NAME }, - { SIGNON_ERROR_INTERNAL_COMMUNICATION, SIGNOND_INTERNAL_COMMUNICATION_ERR_NAME }, - { SIGNON_ERROR_PERMISSION_DENIED, SIGNOND_PERMISSION_DENIED_ERR_NAME }, - { SIGNON_ERROR_METHOD_NOT_KNOWN, SIGNOND_METHOD_NOT_KNOWN_ERR_NAME }, - { SIGNON_ERROR_SERVICE_NOT_AVAILABLE, SIGNOND_SERVICE_NOT_AVAILABLE_ERR_NAME }, - { SIGNON_ERROR_INVALID_QUERY, SIGNOND_INVALID_QUERY_ERR_NAME }, - { SIGNON_ERROR_METHOD_NOT_AVAILABLE, SIGNOND_METHOD_NOT_AVAILABLE_ERR_NAME }, - { SIGNON_ERROR_IDENTITY_NOT_FOUND, SIGNOND_IDENTITY_NOT_FOUND_ERR_NAME }, - { SIGNON_ERROR_STORE_FAILED, SIGNOND_STORE_FAILED_ERR_NAME }, - { SIGNON_ERROR_REMOVE_FAILED, SIGNOND_REMOVE_FAILED_ERR_NAME }, - { SIGNON_ERROR_SIGNOUT_FAILED, SIGNOND_SIGNOUT_FAILED_ERR_NAME }, - { SIGNON_ERROR_IDENTITY_OPERATION_CANCELED, SIGNOND_IDENTITY_OPERATION_CANCELED_ERR_NAME }, - { SIGNON_ERROR_CREDENTIALS_NOT_AVAILABLE, SIGNOND_CREDENTIALS_NOT_AVAILABLE_ERR_NAME }, - { SIGNON_ERROR_REFERENCE_NOT_FOUND, SIGNOND_REFERENCE_NOT_FOUND_ERR_NAME }, - { SIGNON_ERROR_MECHANISM_NOT_AVAILABLE, SIGNOND_MECHANISM_NOT_AVAILABLE_ERR_NAME }, - { SIGNON_ERROR_MISSING_DATA, SIGNOND_MISSING_DATA_ERR_NAME }, - { SIGNON_ERROR_INVALID_CREDENTIALS, SIGNOND_INVALID_CREDENTIALS_ERR_NAME }, - { SIGNON_ERROR_NOT_AUTHORIZED, SIGNOND_NOT_AUTHORIZED_ERR_NAME }, - { SIGNON_ERROR_WRONG_STATE, SIGNOND_WRONG_STATE_ERR_NAME }, - { SIGNON_ERROR_OPERATION_NOT_SUPPORTED, SIGNOND_OPERATION_NOT_SUPPORTED_ERR_NAME }, - { SIGNON_ERROR_NO_CONNECTION, SIGNOND_NO_CONNECTION_ERR_NAME }, - { SIGNON_ERROR_NETWORK, SIGNOND_NETWORK_ERR_NAME }, - { SIGNON_ERROR_SSL, SIGNOND_SSL_ERR_NAME }, - { SIGNON_ERROR_RUNTIME, SIGNOND_RUNTIME_ERR_NAME }, - { SIGNON_ERROR_SESSION_CANCELED, SIGNOND_SESSION_CANCELED_ERR_NAME }, - { SIGNON_ERROR_TIMED_OUT, SIGNOND_TIMED_OUT_ERR_NAME }, - { SIGNON_ERROR_USER_INTERACTION, SIGNOND_USER_INTERACTION_ERR_NAME }, - { SIGNON_ERROR_OPERATION_FAILED, SIGNOND_OPERATION_FAILED_ERR_NAME }, - { SIGNON_ERROR_ENCRYPTION_FAILED, SIGNOND_ENCRYPTION_FAILED_ERR_NAME }, - { SIGNON_ERROR_TOS_NOT_ACCEPTED, SIGNOND_TOS_NOT_ACCEPTED_ERR_NAME }, - { SIGNON_ERROR_FORGOT_PASSWORD, SIGNOND_FORGOT_PASSWORD_ERR_NAME }, - { SIGNON_ERROR_METHOD_OR_MECHANISM_NOT_ALLOWED, SIGNOND_METHOD_OR_MECHANISM_NOT_ALLOWED_ERR_NAME }, - { SIGNON_ERROR_INCORRECT_DATE, SIGNOND_INCORRECT_DATE_ERR_NAME }, - { SIGNON_ERROR_USER_ERROR, SIGNOND_USER_ERROR_ERR_NAME }, -}; - diff --git a/libgsignon-glib/signon-marshal.c b/libgsignon-glib/signon-marshal.c deleted file mode 100644 index d880e61..0000000 --- a/libgsignon-glib/signon-marshal.c +++ /dev/null @@ -1,88 +0,0 @@ - -#include - - -#ifdef G_ENABLE_DEBUG -#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_schar (v) -#define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) -#define g_marshal_value_peek_int(v) g_value_get_int (v) -#define g_marshal_value_peek_uint(v) g_value_get_uint (v) -#define g_marshal_value_peek_long(v) g_value_get_long (v) -#define g_marshal_value_peek_ulong(v) g_value_get_ulong (v) -#define g_marshal_value_peek_int64(v) g_value_get_int64 (v) -#define g_marshal_value_peek_uint64(v) g_value_get_uint64 (v) -#define g_marshal_value_peek_enum(v) g_value_get_enum (v) -#define g_marshal_value_peek_flags(v) g_value_get_flags (v) -#define g_marshal_value_peek_float(v) g_value_get_float (v) -#define g_marshal_value_peek_double(v) g_value_get_double (v) -#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v) -#define g_marshal_value_peek_param(v) g_value_get_param (v) -#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) -#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) -#define g_marshal_value_peek_object(v) g_value_get_object (v) -#define g_marshal_value_peek_variant(v) g_value_get_variant (v) -#else /* !G_ENABLE_DEBUG */ -/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. - * Do not access GValues directly in your code. Instead, use the - * g_value_get_*() functions - */ -#define g_marshal_value_peek_boolean(v) (v)->data[0].v_int -#define g_marshal_value_peek_char(v) (v)->data[0].v_int -#define g_marshal_value_peek_uchar(v) (v)->data[0].v_uint -#define g_marshal_value_peek_int(v) (v)->data[0].v_int -#define g_marshal_value_peek_uint(v) (v)->data[0].v_uint -#define g_marshal_value_peek_long(v) (v)->data[0].v_long -#define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 -#define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 -#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong -#define g_marshal_value_peek_float(v) (v)->data[0].v_float -#define g_marshal_value_peek_double(v) (v)->data[0].v_double -#define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_param(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer -#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer -#endif /* !G_ENABLE_DEBUG */ - - -/* VOID:INT,STRING (signon-marshal.list:1) */ -void -_signon_marshal_VOID__INT_STRING (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) -{ - typedef void (*GMarshalFunc_VOID__INT_STRING) (gpointer data1, - gint arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__INT_STRING callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; - - g_return_if_fail (n_param_values == 3); - - if (G_CCLOSURE_SWAP_DATA (closure)) - { - data1 = closure->data; - data2 = g_value_peek_pointer (param_values + 0); - } - else - { - data1 = g_value_peek_pointer (param_values + 0); - data2 = closure->data; - } - callback = (GMarshalFunc_VOID__INT_STRING) (marshal_data ? marshal_data : cc->callback); - - callback (data1, - g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_string (param_values + 2), - data2); -} - diff --git a/libgsignon-glib/signon-marshal.h b/libgsignon-glib/signon-marshal.h deleted file mode 100644 index 5799829..0000000 --- a/libgsignon-glib/signon-marshal.h +++ /dev/null @@ -1,20 +0,0 @@ - -#ifndef ___signon_marshal_MARSHAL_H__ -#define ___signon_marshal_MARSHAL_H__ - -#include - -G_BEGIN_DECLS - -/* VOID:INT,STRING (signon-marshal.list:1) */ -extern void _signon_marshal_VOID__INT_STRING (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); - -G_END_DECLS - -#endif /* ___signon_marshal_MARSHAL_H__ */ - diff --git a/libgsignon-glib/sso-auth-service-gen.c b/libgsignon-glib/sso-auth-service-gen.c deleted file mode 100644 index 55bdf72..0000000 --- a/libgsignon-glib/sso-auth-service-gen.c +++ /dev/null @@ -1,2723 +0,0 @@ -/* - * Generated by gdbus-codegen 2.32.4. DO NOT EDIT. - * - * The license of this code is the same as for the source it was derived from. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "sso-auth-service-gen.h" - -#include -#ifdef G_OS_UNIX -# include -#endif - -typedef struct -{ - GDBusArgInfo parent_struct; - gboolean use_gvariant; -} _ExtendedGDBusArgInfo; - -typedef struct -{ - GDBusMethodInfo parent_struct; - const gchar *signal_name; - gboolean pass_fdlist; -} _ExtendedGDBusMethodInfo; - -typedef struct -{ - GDBusSignalInfo parent_struct; - const gchar *signal_name; -} _ExtendedGDBusSignalInfo; - -typedef struct -{ - GDBusPropertyInfo parent_struct; - const gchar *hyphen_name; - gboolean use_gvariant; -} _ExtendedGDBusPropertyInfo; - -typedef struct -{ - GDBusInterfaceInfo parent_struct; - const gchar *hyphen_name; -} _ExtendedGDBusInterfaceInfo; - -typedef struct -{ - const _ExtendedGDBusPropertyInfo *info; - guint prop_id; - GValue orig_value; /* the value before the change */ -} ChangedProperty; - -static void -_changed_property_free (ChangedProperty *data) -{ - g_value_unset (&data->orig_value); - g_free (data); -} - -static gboolean -_g_strv_equal0 (gchar **a, gchar **b) -{ - gboolean ret = FALSE; - guint n; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - if (g_strv_length (a) != g_strv_length (b)) - goto out; - for (n = 0; a[n] != NULL; n++) - if (g_strcmp0 (a[n], b[n]) != 0) - goto out; - ret = TRUE; -out: - return ret; -} - -static gboolean -_g_variant_equal0 (GVariant *a, GVariant *b) -{ - gboolean ret = FALSE; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - ret = g_variant_equal (a, b); -out: - return ret; -} - -G_GNUC_UNUSED static gboolean -_g_value_equal (const GValue *a, const GValue *b) -{ - gboolean ret = FALSE; - g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b)); - switch (G_VALUE_TYPE (a)) - { - case G_TYPE_BOOLEAN: - ret = (g_value_get_boolean (a) == g_value_get_boolean (b)); - break; - case G_TYPE_UCHAR: - ret = (g_value_get_uchar (a) == g_value_get_uchar (b)); - break; - case G_TYPE_INT: - ret = (g_value_get_int (a) == g_value_get_int (b)); - break; - case G_TYPE_UINT: - ret = (g_value_get_uint (a) == g_value_get_uint (b)); - break; - case G_TYPE_INT64: - ret = (g_value_get_int64 (a) == g_value_get_int64 (b)); - break; - case G_TYPE_UINT64: - ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b)); - break; - case G_TYPE_DOUBLE: - { - /* Avoid -Wfloat-equal warnings by doing a direct bit compare */ - gdouble da = g_value_get_double (a); - gdouble db = g_value_get_double (b); - ret = memcmp (&da, &db, sizeof (gdouble)) == 0; - } - break; - case G_TYPE_STRING: - ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0); - break; - case G_TYPE_VARIANT: - ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b)); - break; - default: - if (G_VALUE_TYPE (a) == G_TYPE_STRV) - ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b)); - else - g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a))); - break; - } - return ret; -} - -/* ------------------------------------------------------------------------ - * Code for interface com.google.code.AccountsSSO.gSingleSignOn.AuthService - * ------------------------------------------------------------------------ - */ - -/** - * SECTION:SsoAuthService - * @title: SsoAuthService - * @short_description: Generated C code for the com.google.code.AccountsSSO.gSingleSignOn.AuthService D-Bus interface - * - * This section contains code for working with the com.google.code.AccountsSSO.gSingleSignOn.AuthService D-Bus interface in C. - */ - -/* ---- Introspection data for com.google.code.AccountsSSO.gSingleSignOn.AuthService ---- */ - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_register_new_identity_IN_ARG_applicationContext = -{ - { - -1, - "applicationContext", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_register_new_identity_IN_ARG_pointers[] = -{ - &_sso_auth_service_method_info_register_new_identity_IN_ARG_applicationContext, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_register_new_identity_OUT_ARG_objectPath = -{ - { - -1, - "objectPath", - "o", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_register_new_identity_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_register_new_identity_OUT_ARG_objectPath, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_register_new_identity = -{ - { - -1, - "registerNewIdentity", - (GDBusArgInfo **) &_sso_auth_service_method_info_register_new_identity_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_auth_service_method_info_register_new_identity_OUT_ARG_pointers, - NULL - }, - "handle-register-new-identity", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_get_identity_IN_ARG_id = -{ - { - -1, - "id", - "u", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_get_identity_IN_ARG_applicationContext = -{ - { - -1, - "applicationContext", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_get_identity_IN_ARG_pointers[] = -{ - &_sso_auth_service_method_info_get_identity_IN_ARG_id, - &_sso_auth_service_method_info_get_identity_IN_ARG_applicationContext, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_get_identity_OUT_ARG_objectPath = -{ - { - -1, - "objectPath", - "o", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_get_identity_OUT_ARG_identityData = -{ - { - -1, - "identityData", - "a{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_get_identity_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_get_identity_OUT_ARG_objectPath, - &_sso_auth_service_method_info_get_identity_OUT_ARG_identityData, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_get_identity = -{ - { - -1, - "getIdentity", - (GDBusArgInfo **) &_sso_auth_service_method_info_get_identity_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_auth_service_method_info_get_identity_OUT_ARG_pointers, - NULL - }, - "handle-get-identity", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_query_methods_OUT_ARG_authMethods = -{ - { - -1, - "authMethods", - "as", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_query_methods_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_query_methods_OUT_ARG_authMethods, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_query_methods = -{ - { - -1, - "queryMethods", - NULL, - (GDBusArgInfo **) &_sso_auth_service_method_info_query_methods_OUT_ARG_pointers, - NULL - }, - "handle-query-methods", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_query_mechanisms_IN_ARG_method = -{ - { - -1, - "method", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_query_mechanisms_IN_ARG_pointers[] = -{ - &_sso_auth_service_method_info_query_mechanisms_IN_ARG_method, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_query_mechanisms_OUT_ARG_mechanisms = -{ - { - -1, - "mechanisms", - "as", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_query_mechanisms_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_query_mechanisms_OUT_ARG_mechanisms, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_query_mechanisms = -{ - { - -1, - "queryMechanisms", - (GDBusArgInfo **) &_sso_auth_service_method_info_query_mechanisms_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_auth_service_method_info_query_mechanisms_OUT_ARG_pointers, - NULL - }, - "handle-query-mechanisms", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_query_identities_IN_ARG_filter = -{ - { - -1, - "filter", - "a{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_query_identities_IN_ARG_applicationContext = -{ - { - -1, - "applicationContext", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_query_identities_IN_ARG_pointers[] = -{ - &_sso_auth_service_method_info_query_identities_IN_ARG_filter, - &_sso_auth_service_method_info_query_identities_IN_ARG_applicationContext, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_query_identities_OUT_ARG_identities = -{ - { - -1, - "identities", - "aa{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_query_identities_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_query_identities_OUT_ARG_identities, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_query_identities = -{ - { - -1, - "queryIdentities", - (GDBusArgInfo **) &_sso_auth_service_method_info_query_identities_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_auth_service_method_info_query_identities_OUT_ARG_pointers, - NULL - }, - "handle-query-identities", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_clear_OUT_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "b", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_clear_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_clear_OUT_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_clear = -{ - { - -1, - "clear", - NULL, - (GDBusArgInfo **) &_sso_auth_service_method_info_clear_OUT_ARG_pointers, - NULL - }, - "handle-clear", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_backup_starts_OUT_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "y", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_backup_starts_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_backup_starts_OUT_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_backup_starts = -{ - { - -1, - "backupStarts", - NULL, - (GDBusArgInfo **) &_sso_auth_service_method_info_backup_starts_OUT_ARG_pointers, - NULL - }, - "handle-backup-starts", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_backup_finished_OUT_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "y", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_backup_finished_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_backup_finished_OUT_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_backup_finished = -{ - { - -1, - "backupFinished", - NULL, - (GDBusArgInfo **) &_sso_auth_service_method_info_backup_finished_OUT_ARG_pointers, - NULL - }, - "handle-backup-finished", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_restore_starts_OUT_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "y", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_restore_starts_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_restore_starts_OUT_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_restore_starts = -{ - { - -1, - "restoreStarts", - NULL, - (GDBusArgInfo **) &_sso_auth_service_method_info_restore_starts_OUT_ARG_pointers, - NULL - }, - "handle-restore-starts", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_service_method_info_restore_finished_OUT_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "y", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_service_method_info_restore_finished_OUT_ARG_pointers[] = -{ - &_sso_auth_service_method_info_restore_finished_OUT_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_service_method_info_restore_finished = -{ - { - -1, - "restoreFinished", - NULL, - (GDBusArgInfo **) &_sso_auth_service_method_info_restore_finished_OUT_ARG_pointers, - NULL - }, - "handle-restore-finished", - FALSE -}; - -static const _ExtendedGDBusMethodInfo * const _sso_auth_service_method_info_pointers[] = -{ - &_sso_auth_service_method_info_register_new_identity, - &_sso_auth_service_method_info_get_identity, - &_sso_auth_service_method_info_query_methods, - &_sso_auth_service_method_info_query_mechanisms, - &_sso_auth_service_method_info_query_identities, - &_sso_auth_service_method_info_clear, - &_sso_auth_service_method_info_backup_starts, - &_sso_auth_service_method_info_backup_finished, - &_sso_auth_service_method_info_restore_starts, - &_sso_auth_service_method_info_restore_finished, - NULL -}; - -static const _ExtendedGDBusInterfaceInfo _sso_auth_service_interface_info = -{ - { - -1, - "com.google.code.AccountsSSO.gSingleSignOn.AuthService", - (GDBusMethodInfo **) &_sso_auth_service_method_info_pointers, - NULL, - NULL, - NULL - }, - "sso-auth-service", -}; - - -/** - * sso_auth_service_interface_info: - * - * Gets a machine-readable description of the com.google.code.AccountsSSO.gSingleSignOn.AuthService D-Bus interface. - * - * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. - */ -GDBusInterfaceInfo * -sso_auth_service_interface_info (void) -{ - return (GDBusInterfaceInfo *) &_sso_auth_service_interface_info; -} - -/** - * sso_auth_service_override_properties: - * @klass: The class structure for a #GObject-derived class. - * @property_id_begin: The property id to assign to the first overridden property. - * - * Overrides all #GObject properties in the #SsoAuthService interface for a concrete class. - * The properties are overridden in the order they are defined. - * - * Returns: The last property id. - */ -guint -sso_auth_service_override_properties (GObjectClass *klass, guint property_id_begin) -{ - return property_id_begin - 1; -} - - - -/** - * SsoAuthService: - * - * Abstract interface type for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthService. - */ - -/** - * SsoAuthServiceIface: - * @parent_iface: The parent interface. - * @handle_backup_finished: Handler for the #SsoAuthService::handle-backup-finished signal. - * @handle_backup_starts: Handler for the #SsoAuthService::handle-backup-starts signal. - * @handle_clear: Handler for the #SsoAuthService::handle-clear signal. - * @handle_get_identity: Handler for the #SsoAuthService::handle-get-identity signal. - * @handle_query_identities: Handler for the #SsoAuthService::handle-query-identities signal. - * @handle_query_mechanisms: Handler for the #SsoAuthService::handle-query-mechanisms signal. - * @handle_query_methods: Handler for the #SsoAuthService::handle-query-methods signal. - * @handle_register_new_identity: Handler for the #SsoAuthService::handle-register-new-identity signal. - * @handle_restore_finished: Handler for the #SsoAuthService::handle-restore-finished signal. - * @handle_restore_starts: Handler for the #SsoAuthService::handle-restore-starts signal. - * - * Virtual table for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthService. - */ - -static void -sso_auth_service_default_init (SsoAuthServiceIface *iface) -{ - /* GObject signals for incoming D-Bus method calls: */ - /** - * SsoAuthService::handle-register-new-identity: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * @arg_applicationContext: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the registerNewIdentity() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_register_new_identity() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-register-new-identity", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_register_new_identity), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); - - /** - * SsoAuthService::handle-get-identity: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * @arg_id: Argument passed by remote caller. - * @arg_applicationContext: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the getIdentity() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_get_identity() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-get-identity", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_get_identity), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 3, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_UINT, G_TYPE_STRING); - - /** - * SsoAuthService::handle-query-methods: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the queryMethods() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_query_methods() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-query-methods", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_query_methods), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoAuthService::handle-query-mechanisms: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * @arg_method: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the queryMechanisms() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_query_mechanisms() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-query-mechanisms", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_query_mechanisms), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); - - /** - * SsoAuthService::handle-query-identities: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * @arg_filter: Argument passed by remote caller. - * @arg_applicationContext: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the queryIdentities() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_query_identities() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-query-identities", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_query_identities), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 3, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_VARIANT, G_TYPE_STRING); - - /** - * SsoAuthService::handle-clear: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the clear() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_clear() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-clear", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_clear), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoAuthService::handle-backup-starts: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the backupStarts() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_backup_starts() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-backup-starts", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_backup_starts), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoAuthService::handle-backup-finished: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the backupFinished() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_backup_finished() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-backup-finished", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_backup_finished), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoAuthService::handle-restore-starts: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the restoreStarts() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_restore_starts() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-restore-starts", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_restore_starts), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoAuthService::handle-restore-finished: - * @object: A #SsoAuthService. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the restoreFinished() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_service_complete_restore_finished() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-restore-finished", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthServiceIface, handle_restore_finished), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - -} - -typedef SsoAuthServiceIface SsoAuthServiceInterface; -G_DEFINE_INTERFACE (SsoAuthService, sso_auth_service, G_TYPE_OBJECT); - -/** - * sso_auth_service_call_register_new_identity: - * @proxy: A #SsoAuthServiceProxy. - * @arg_applicationContext: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the registerNewIdentity() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_register_new_identity_finish() to get the result of the operation. - * - * See sso_auth_service_call_register_new_identity_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_register_new_identity ( - SsoAuthService *proxy, - const gchar *arg_applicationContext, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "registerNewIdentity", - g_variant_new ("(s)", - arg_applicationContext), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_register_new_identity_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_objectPath: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_register_new_identity(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_register_new_identity(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_register_new_identity_finish ( - SsoAuthService *proxy, - gchar **out_objectPath, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(o)", - out_objectPath); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_register_new_identity_sync: - * @proxy: A #SsoAuthServiceProxy. - * @arg_applicationContext: Argument to pass with the method invocation. - * @out_objectPath: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the registerNewIdentity() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_register_new_identity() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_register_new_identity_sync ( - SsoAuthService *proxy, - const gchar *arg_applicationContext, - gchar **out_objectPath, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "registerNewIdentity", - g_variant_new ("(s)", - arg_applicationContext), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(o)", - out_objectPath); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_get_identity: - * @proxy: A #SsoAuthServiceProxy. - * @arg_id: Argument to pass with the method invocation. - * @arg_applicationContext: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the getIdentity() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_get_identity_finish() to get the result of the operation. - * - * See sso_auth_service_call_get_identity_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_get_identity ( - SsoAuthService *proxy, - guint arg_id, - const gchar *arg_applicationContext, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "getIdentity", - g_variant_new ("(us)", - arg_id, - arg_applicationContext), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_get_identity_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_objectPath: (out): Return location for return parameter or %NULL to ignore. - * @out_identityData: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_get_identity(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_get_identity(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_get_identity_finish ( - SsoAuthService *proxy, - gchar **out_objectPath, - GVariant **out_identityData, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(o@a{sv})", - out_objectPath, - out_identityData); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_get_identity_sync: - * @proxy: A #SsoAuthServiceProxy. - * @arg_id: Argument to pass with the method invocation. - * @arg_applicationContext: Argument to pass with the method invocation. - * @out_objectPath: (out): Return location for return parameter or %NULL to ignore. - * @out_identityData: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the getIdentity() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_get_identity() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_get_identity_sync ( - SsoAuthService *proxy, - guint arg_id, - const gchar *arg_applicationContext, - gchar **out_objectPath, - GVariant **out_identityData, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "getIdentity", - g_variant_new ("(us)", - arg_id, - arg_applicationContext), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(o@a{sv})", - out_objectPath, - out_identityData); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_query_methods: - * @proxy: A #SsoAuthServiceProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the queryMethods() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_query_methods_finish() to get the result of the operation. - * - * See sso_auth_service_call_query_methods_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_query_methods ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "queryMethods", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_query_methods_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_authMethods: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_query_methods(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_query_methods(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_query_methods_finish ( - SsoAuthService *proxy, - gchar ***out_authMethods, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(^as)", - out_authMethods); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_query_methods_sync: - * @proxy: A #SsoAuthServiceProxy. - * @out_authMethods: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the queryMethods() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_query_methods() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_query_methods_sync ( - SsoAuthService *proxy, - gchar ***out_authMethods, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "queryMethods", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(^as)", - out_authMethods); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_query_mechanisms: - * @proxy: A #SsoAuthServiceProxy. - * @arg_method: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the queryMechanisms() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_query_mechanisms_finish() to get the result of the operation. - * - * See sso_auth_service_call_query_mechanisms_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_query_mechanisms ( - SsoAuthService *proxy, - const gchar *arg_method, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "queryMechanisms", - g_variant_new ("(s)", - arg_method), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_query_mechanisms_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_mechanisms: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_query_mechanisms(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_query_mechanisms(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_query_mechanisms_finish ( - SsoAuthService *proxy, - gchar ***out_mechanisms, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(^as)", - out_mechanisms); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_query_mechanisms_sync: - * @proxy: A #SsoAuthServiceProxy. - * @arg_method: Argument to pass with the method invocation. - * @out_mechanisms: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the queryMechanisms() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_query_mechanisms() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_query_mechanisms_sync ( - SsoAuthService *proxy, - const gchar *arg_method, - gchar ***out_mechanisms, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "queryMechanisms", - g_variant_new ("(s)", - arg_method), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(^as)", - out_mechanisms); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_query_identities: - * @proxy: A #SsoAuthServiceProxy. - * @arg_filter: Argument to pass with the method invocation. - * @arg_applicationContext: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the queryIdentities() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_query_identities_finish() to get the result of the operation. - * - * See sso_auth_service_call_query_identities_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_query_identities ( - SsoAuthService *proxy, - GVariant *arg_filter, - const gchar *arg_applicationContext, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "queryIdentities", - g_variant_new ("(@a{sv}s)", - arg_filter, - arg_applicationContext), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_query_identities_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_identities: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_query_identities(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_query_identities(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_query_identities_finish ( - SsoAuthService *proxy, - GVariant **out_identities, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(@aa{sv})", - out_identities); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_query_identities_sync: - * @proxy: A #SsoAuthServiceProxy. - * @arg_filter: Argument to pass with the method invocation. - * @arg_applicationContext: Argument to pass with the method invocation. - * @out_identities: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the queryIdentities() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_query_identities() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_query_identities_sync ( - SsoAuthService *proxy, - GVariant *arg_filter, - const gchar *arg_applicationContext, - GVariant **out_identities, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "queryIdentities", - g_variant_new ("(@a{sv}s)", - arg_filter, - arg_applicationContext), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(@aa{sv})", - out_identities); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_clear: - * @proxy: A #SsoAuthServiceProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the clear() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_clear_finish() to get the result of the operation. - * - * See sso_auth_service_call_clear_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_clear ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "clear", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_clear_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_clear(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_clear(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_clear_finish ( - SsoAuthService *proxy, - gboolean *out_unnamed_arg0, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_clear_sync: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the clear() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_clear() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_clear_sync ( - SsoAuthService *proxy, - gboolean *out_unnamed_arg0, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "clear", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_backup_starts: - * @proxy: A #SsoAuthServiceProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the backupStarts() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_backup_starts_finish() to get the result of the operation. - * - * See sso_auth_service_call_backup_starts_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_backup_starts ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "backupStarts", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_backup_starts_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_backup_starts(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_backup_starts(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_backup_starts_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_backup_starts_sync: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the backupStarts() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_backup_starts() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_backup_starts_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "backupStarts", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_backup_finished: - * @proxy: A #SsoAuthServiceProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the backupFinished() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_backup_finished_finish() to get the result of the operation. - * - * See sso_auth_service_call_backup_finished_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_backup_finished ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "backupFinished", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_backup_finished_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_backup_finished(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_backup_finished(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_backup_finished_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_backup_finished_sync: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the backupFinished() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_backup_finished() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_backup_finished_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "backupFinished", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_restore_starts: - * @proxy: A #SsoAuthServiceProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the restoreStarts() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_restore_starts_finish() to get the result of the operation. - * - * See sso_auth_service_call_restore_starts_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_restore_starts ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "restoreStarts", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_restore_starts_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_restore_starts(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_restore_starts(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_restore_starts_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_restore_starts_sync: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the restoreStarts() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_restore_starts() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_restore_starts_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "restoreStarts", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_restore_finished: - * @proxy: A #SsoAuthServiceProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the restoreFinished() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_call_restore_finished_finish() to get the result of the operation. - * - * See sso_auth_service_call_restore_finished_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_service_call_restore_finished ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "restoreFinished", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_service_call_restore_finished_finish: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_call_restore_finished(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_service_call_restore_finished(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_restore_finished_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_call_restore_finished_sync: - * @proxy: A #SsoAuthServiceProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the restoreFinished() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_service_call_restore_finished() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_service_call_restore_finished_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "restoreFinished", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(y)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_service_complete_register_new_identity: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @objectPath: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the registerNewIdentity() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_register_new_identity ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *objectPath) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(o)", - objectPath)); -} - -/** - * sso_auth_service_complete_get_identity: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @objectPath: Parameter to return. - * @identityData: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the getIdentity() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_get_identity ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *objectPath, - GVariant *identityData) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(o@a{sv})", - objectPath, - identityData)); -} - -/** - * sso_auth_service_complete_query_methods: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @authMethods: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the queryMethods() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_query_methods ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *const *authMethods) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(^as)", - authMethods)); -} - -/** - * sso_auth_service_complete_query_mechanisms: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @mechanisms: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the queryMechanisms() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_query_mechanisms ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *const *mechanisms) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(^as)", - mechanisms)); -} - -/** - * sso_auth_service_complete_query_identities: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @identities: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the queryIdentities() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_query_identities ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - GVariant *identities) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(@aa{sv})", - identities)); -} - -/** - * sso_auth_service_complete_clear: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg0: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the clear() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_clear ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg0) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(b)", - unnamed_arg0)); -} - -/** - * sso_auth_service_complete_backup_starts: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg0: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the backupStarts() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_backup_starts ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(y)", - unnamed_arg0)); -} - -/** - * sso_auth_service_complete_backup_finished: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg0: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the backupFinished() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_backup_finished ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(y)", - unnamed_arg0)); -} - -/** - * sso_auth_service_complete_restore_starts: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg0: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the restoreStarts() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_restore_starts ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(y)", - unnamed_arg0)); -} - -/** - * sso_auth_service_complete_restore_finished: - * @object: A #SsoAuthService. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg0: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the restoreFinished() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_service_complete_restore_finished ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(y)", - unnamed_arg0)); -} - -/* ------------------------------------------------------------------------ */ - -/** - * SsoAuthServiceProxy: - * - * The #SsoAuthServiceProxy structure contains only private data and should only be accessed using the provided API. - */ - -/** - * SsoAuthServiceProxyClass: - * @parent_class: The parent class. - * - * Class structure for #SsoAuthServiceProxy. - */ - -struct _SsoAuthServiceProxyPrivate -{ - GData *qdata; -}; - -static void sso_auth_service_proxy_iface_init (SsoAuthServiceIface *iface); - -G_DEFINE_TYPE_WITH_CODE (SsoAuthServiceProxy, sso_auth_service_proxy, G_TYPE_DBUS_PROXY, - G_IMPLEMENT_INTERFACE (TYPE_SSO_AUTH_SERVICE, sso_auth_service_proxy_iface_init)); - -static void -sso_auth_service_proxy_finalize (GObject *object) -{ - SsoAuthServiceProxy *proxy = SSO_AUTH_SERVICE_PROXY (object); - g_datalist_clear (&proxy->priv->qdata); - G_OBJECT_CLASS (sso_auth_service_proxy_parent_class)->finalize (object); -} - -static void -sso_auth_service_proxy_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ -} - -static void -sso_auth_service_proxy_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ -} - -static void -sso_auth_service_proxy_g_signal (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, - GVariant *parameters) -{ - _ExtendedGDBusSignalInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - guint num_params; - guint n; - guint signal_id; - info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_sso_auth_service_interface_info, signal_name); - if (info == NULL) - return; - num_params = g_variant_n_children (parameters); - paramv = g_new0 (GValue, num_params + 1); - g_value_init (¶mv[0], TYPE_SSO_AUTH_SERVICE); - g_value_set_object (¶mv[0], proxy); - g_variant_iter_init (&iter, parameters); - n = 1; - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_SSO_AUTH_SERVICE); - g_signal_emitv (paramv, signal_id, 0, NULL); - for (n = 0; n < num_params + 1; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static void -sso_auth_service_proxy_g_properties_changed (GDBusProxy *_proxy, - GVariant *changed_properties, - const gchar *const *invalidated_properties) -{ - SsoAuthServiceProxy *proxy = SSO_AUTH_SERVICE_PROXY (_proxy); - guint n; - const gchar *key; - GVariantIter *iter; - _ExtendedGDBusPropertyInfo *info; - g_variant_get (changed_properties, "a{sv}", &iter); - while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_service_interface_info, key); - g_datalist_remove_data (&proxy->priv->qdata, key); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } - g_variant_iter_free (iter); - for (n = 0; invalidated_properties[n] != NULL; n++) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_service_interface_info, invalidated_properties[n]); - g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } -} - -static void -sso_auth_service_proxy_init (SsoAuthServiceProxy *proxy) -{ - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_SSO_AUTH_SERVICE_PROXY, SsoAuthServiceProxyPrivate); - g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), sso_auth_service_interface_info ()); -} - -static void -sso_auth_service_proxy_class_init (SsoAuthServiceProxyClass *klass) -{ - GObjectClass *gobject_class; - GDBusProxyClass *proxy_class; - - g_type_class_add_private (klass, sizeof (SsoAuthServiceProxyPrivate)); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = sso_auth_service_proxy_finalize; - gobject_class->get_property = sso_auth_service_proxy_get_property; - gobject_class->set_property = sso_auth_service_proxy_set_property; - - proxy_class = G_DBUS_PROXY_CLASS (klass); - proxy_class->g_signal = sso_auth_service_proxy_g_signal; - proxy_class->g_properties_changed = sso_auth_service_proxy_g_properties_changed; - -} - -static void -sso_auth_service_proxy_iface_init (SsoAuthServiceIface *iface) -{ -} - -/** - * sso_auth_service_proxy_new: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Asynchronously creates a proxy for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthService. See g_dbus_proxy_new() for more details. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_proxy_new_finish() to get the result of the operation. - * - * See sso_auth_service_proxy_new_sync() for the synchronous, blocking version of this constructor. - */ -void -sso_auth_service_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_SSO_AUTH_SERVICE_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthService", NULL); -} - -/** - * sso_auth_service_proxy_new_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_proxy_new(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with sso_auth_service_proxy_new(). - * - * Returns: (transfer full) (type SsoAuthServiceProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthService * -sso_auth_service_proxy_new_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return SSO_AUTH_SERVICE (ret); - else - return NULL; -} - -/** - * sso_auth_service_proxy_new_sync: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Synchronously creates a proxy for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthService. See g_dbus_proxy_new_sync() for more details. - * - * The calling thread is blocked until a reply is received. - * - * See sso_auth_service_proxy_new() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type SsoAuthServiceProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthService * -sso_auth_service_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_SSO_AUTH_SERVICE_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthService", NULL); - if (ret != NULL) - return SSO_AUTH_SERVICE (ret); - else - return NULL; -} - - -/** - * sso_auth_service_proxy_new_for_bus: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Like sso_auth_service_proxy_new() but takes a #GBusType instead of a #GDBusConnection. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_service_proxy_new_for_bus_finish() to get the result of the operation. - * - * See sso_auth_service_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. - */ -void -sso_auth_service_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_SSO_AUTH_SERVICE_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthService", NULL); -} - -/** - * sso_auth_service_proxy_new_for_bus_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_service_proxy_new_for_bus(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with sso_auth_service_proxy_new_for_bus(). - * - * Returns: (transfer full) (type SsoAuthServiceProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthService * -sso_auth_service_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return SSO_AUTH_SERVICE (ret); - else - return NULL; -} - -/** - * sso_auth_service_proxy_new_for_bus_sync: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Like sso_auth_service_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. - * - * The calling thread is blocked until a reply is received. - * - * See sso_auth_service_proxy_new_for_bus() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type SsoAuthServiceProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthService * -sso_auth_service_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_SSO_AUTH_SERVICE_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthService", NULL); - if (ret != NULL) - return SSO_AUTH_SERVICE (ret); - else - return NULL; -} - - -/* ------------------------------------------------------------------------ */ - -/** - * SsoAuthServiceSkeleton: - * - * The #SsoAuthServiceSkeleton structure contains only private data and should only be accessed using the provided API. - */ - -/** - * SsoAuthServiceSkeletonClass: - * @parent_class: The parent class. - * - * Class structure for #SsoAuthServiceSkeleton. - */ - -struct _SsoAuthServiceSkeletonPrivate -{ - GValue *properties; - GList *changed_properties; - GSource *changed_properties_idle_source; - GMainContext *context; - GMutex lock; -}; - -static void -_sso_auth_service_skeleton_handle_method_call ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *method_name, - GVariant *parameters, - GDBusMethodInvocation *invocation, - gpointer user_data) -{ - SsoAuthServiceSkeleton *skeleton = SSO_AUTH_SERVICE_SKELETON (user_data); - _ExtendedGDBusMethodInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - guint num_params; - guint num_extra; - guint n; - guint signal_id; - GValue return_value = G_VALUE_INIT; - info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); - g_assert (info != NULL); - num_params = g_variant_n_children (parameters); - num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); - n = 0; - g_value_init (¶mv[n], TYPE_SSO_AUTH_SERVICE); - g_value_set_object (¶mv[n++], skeleton); - g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); - g_value_set_object (¶mv[n++], invocation); - if (info->pass_fdlist) - { -#ifdef G_OS_UNIX - g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); - g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); -#else - g_assert_not_reached (); -#endif - } - g_variant_iter_init (&iter, parameters); - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_SSO_AUTH_SERVICE); - g_value_init (&return_value, G_TYPE_BOOLEAN); - g_signal_emitv (paramv, signal_id, 0, &return_value); - if (!g_value_get_boolean (&return_value)) - g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); - g_value_unset (&return_value); - for (n = 0; n < num_params + num_extra; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static GVariant * -_sso_auth_service_skeleton_handle_get_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GError **error, - gpointer user_data) -{ - SsoAuthServiceSkeleton *skeleton = SSO_AUTH_SERVICE_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - GVariant *ret; - ret = NULL; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_service_interface_info, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); - ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); - g_value_unset (&value); - } - return ret; -} - -static gboolean -_sso_auth_service_skeleton_handle_set_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GVariant *variant, - GError **error, - gpointer user_data) -{ - SsoAuthServiceSkeleton *skeleton = SSO_AUTH_SERVICE_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - gboolean ret; - ret = FALSE; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_service_interface_info, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - if (info->use_gvariant) - g_value_set_variant (&value, variant); - else - g_dbus_gvariant_to_gvalue (variant, &value); - g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); - g_value_unset (&value); - ret = TRUE; - } - return ret; -} - -static const GDBusInterfaceVTable _sso_auth_service_skeleton_vtable = -{ - _sso_auth_service_skeleton_handle_method_call, - _sso_auth_service_skeleton_handle_get_property, - _sso_auth_service_skeleton_handle_set_property -}; - -static GDBusInterfaceInfo * -sso_auth_service_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton) -{ - return sso_auth_service_interface_info (); -} - -static GDBusInterfaceVTable * -sso_auth_service_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton) -{ - return (GDBusInterfaceVTable *) &_sso_auth_service_skeleton_vtable; -} - -static GVariant * -sso_auth_service_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) -{ - SsoAuthServiceSkeleton *skeleton = SSO_AUTH_SERVICE_SKELETON (_skeleton); - - GVariantBuilder builder; - guint n; - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); - if (_sso_auth_service_interface_info.parent_struct.properties == NULL) - goto out; - for (n = 0; _sso_auth_service_interface_info.parent_struct.properties[n] != NULL; n++) - { - GDBusPropertyInfo *info = _sso_auth_service_interface_info.parent_struct.properties[n]; - if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) - { - GVariant *value; - value = _sso_auth_service_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "com.google.code.AccountsSSO.gSingleSignOn.AuthService", info->name, NULL, skeleton); - if (value != NULL) - { - g_variant_take_ref (value); - g_variant_builder_add (&builder, "{sv}", info->name, value); - g_variant_unref (value); - } - } - } -out: - return g_variant_builder_end (&builder); -} - -static void -sso_auth_service_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) -{ -} - -static void sso_auth_service_skeleton_iface_init (SsoAuthServiceIface *iface); -G_DEFINE_TYPE_WITH_CODE (SsoAuthServiceSkeleton, sso_auth_service_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, - G_IMPLEMENT_INTERFACE (TYPE_SSO_AUTH_SERVICE, sso_auth_service_skeleton_iface_init)); - -static void -sso_auth_service_skeleton_finalize (GObject *object) -{ - SsoAuthServiceSkeleton *skeleton = SSO_AUTH_SERVICE_SKELETON (object); - g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); - if (skeleton->priv->changed_properties_idle_source != NULL) - g_source_destroy (skeleton->priv->changed_properties_idle_source); - g_main_context_unref (skeleton->priv->context); - g_mutex_clear (&skeleton->priv->lock); - G_OBJECT_CLASS (sso_auth_service_skeleton_parent_class)->finalize (object); -} - -static void -sso_auth_service_skeleton_init (SsoAuthServiceSkeleton *skeleton) -{ - skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_SSO_AUTH_SERVICE_SKELETON, SsoAuthServiceSkeletonPrivate); - g_mutex_init (&skeleton->priv->lock); - skeleton->priv->context = g_main_context_ref_thread_default (); -} - -static void -sso_auth_service_skeleton_class_init (SsoAuthServiceSkeletonClass *klass) -{ - GObjectClass *gobject_class; - GDBusInterfaceSkeletonClass *skeleton_class; - - g_type_class_add_private (klass, sizeof (SsoAuthServiceSkeletonPrivate)); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = sso_auth_service_skeleton_finalize; - - skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); - skeleton_class->get_info = sso_auth_service_skeleton_dbus_interface_get_info; - skeleton_class->get_properties = sso_auth_service_skeleton_dbus_interface_get_properties; - skeleton_class->flush = sso_auth_service_skeleton_dbus_interface_flush; - skeleton_class->get_vtable = sso_auth_service_skeleton_dbus_interface_get_vtable; -} - -static void -sso_auth_service_skeleton_iface_init (SsoAuthServiceIface *iface) -{ -} - -/** - * sso_auth_service_skeleton_new: - * - * Creates a skeleton object for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthService. - * - * Returns: (transfer full) (type SsoAuthServiceSkeleton): The skeleton object. - */ -SsoAuthService * -sso_auth_service_skeleton_new (void) -{ - return SSO_AUTH_SERVICE (g_object_new (TYPE_SSO_AUTH_SERVICE_SKELETON, NULL)); -} - diff --git a/libgsignon-glib/sso-auth-service-gen.h b/libgsignon-glib/sso-auth-service-gen.h deleted file mode 100644 index e524010..0000000 --- a/libgsignon-glib/sso-auth-service-gen.h +++ /dev/null @@ -1,434 +0,0 @@ -/* - * Generated by gdbus-codegen 2.32.4. DO NOT EDIT. - * - * The license of this code is the same as for the source it was derived from. - */ - -#ifndef __SSO_AUTH_SERVICE_GEN_H__ -#define __SSO_AUTH_SERVICE_GEN_H__ - -#include - -G_BEGIN_DECLS - - -/* ------------------------------------------------------------------------ */ -/* Declarations for com.google.code.AccountsSSO.gSingleSignOn.AuthService */ - -#define TYPE_SSO_AUTH_SERVICE (sso_auth_service_get_type ()) -#define SSO_AUTH_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_AUTH_SERVICE, SsoAuthService)) -#define IS_SSO_AUTH_SERVICE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_AUTH_SERVICE)) -#define SSO_AUTH_SERVICE_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_SSO_AUTH_SERVICE, SsoAuthServiceIface)) - -struct _SsoAuthService; -typedef struct _SsoAuthService SsoAuthService; -typedef struct _SsoAuthServiceIface SsoAuthServiceIface; - -struct _SsoAuthServiceIface -{ - GTypeInterface parent_iface; - - gboolean (*handle_backup_finished) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_backup_starts) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_clear) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_get_identity) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guint arg_id, - const gchar *arg_applicationContext); - - gboolean (*handle_query_identities) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - GVariant *arg_filter, - const gchar *arg_applicationContext); - - gboolean (*handle_query_mechanisms) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *arg_method); - - gboolean (*handle_query_methods) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_register_new_identity) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *arg_applicationContext); - - gboolean (*handle_restore_finished) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_restore_starts) ( - SsoAuthService *object, - GDBusMethodInvocation *invocation); - -}; - -GType sso_auth_service_get_type (void) G_GNUC_CONST; - -GDBusInterfaceInfo *sso_auth_service_interface_info (void); -guint sso_auth_service_override_properties (GObjectClass *klass, guint property_id_begin); - - -/* D-Bus method call completion functions: */ -void sso_auth_service_complete_register_new_identity ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *objectPath); - -void sso_auth_service_complete_get_identity ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *objectPath, - GVariant *identityData); - -void sso_auth_service_complete_query_methods ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *const *authMethods); - -void sso_auth_service_complete_query_mechanisms ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - const gchar *const *mechanisms); - -void sso_auth_service_complete_query_identities ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - GVariant *identities); - -void sso_auth_service_complete_clear ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg0); - -void sso_auth_service_complete_backup_starts ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0); - -void sso_auth_service_complete_backup_finished ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0); - -void sso_auth_service_complete_restore_starts ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0); - -void sso_auth_service_complete_restore_finished ( - SsoAuthService *object, - GDBusMethodInvocation *invocation, - guchar unnamed_arg0); - - - -/* D-Bus method calls: */ -void sso_auth_service_call_register_new_identity ( - SsoAuthService *proxy, - const gchar *arg_applicationContext, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_register_new_identity_finish ( - SsoAuthService *proxy, - gchar **out_objectPath, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_register_new_identity_sync ( - SsoAuthService *proxy, - const gchar *arg_applicationContext, - gchar **out_objectPath, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_get_identity ( - SsoAuthService *proxy, - guint arg_id, - const gchar *arg_applicationContext, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_get_identity_finish ( - SsoAuthService *proxy, - gchar **out_objectPath, - GVariant **out_identityData, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_get_identity_sync ( - SsoAuthService *proxy, - guint arg_id, - const gchar *arg_applicationContext, - gchar **out_objectPath, - GVariant **out_identityData, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_query_methods ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_query_methods_finish ( - SsoAuthService *proxy, - gchar ***out_authMethods, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_query_methods_sync ( - SsoAuthService *proxy, - gchar ***out_authMethods, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_query_mechanisms ( - SsoAuthService *proxy, - const gchar *arg_method, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_query_mechanisms_finish ( - SsoAuthService *proxy, - gchar ***out_mechanisms, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_query_mechanisms_sync ( - SsoAuthService *proxy, - const gchar *arg_method, - gchar ***out_mechanisms, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_query_identities ( - SsoAuthService *proxy, - GVariant *arg_filter, - const gchar *arg_applicationContext, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_query_identities_finish ( - SsoAuthService *proxy, - GVariant **out_identities, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_query_identities_sync ( - SsoAuthService *proxy, - GVariant *arg_filter, - const gchar *arg_applicationContext, - GVariant **out_identities, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_clear ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_clear_finish ( - SsoAuthService *proxy, - gboolean *out_unnamed_arg0, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_clear_sync ( - SsoAuthService *proxy, - gboolean *out_unnamed_arg0, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_backup_starts ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_backup_starts_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_backup_starts_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_backup_finished ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_backup_finished_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_backup_finished_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_restore_starts ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_restore_starts_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_restore_starts_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_call_restore_finished ( - SsoAuthService *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_service_call_restore_finished_finish ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_service_call_restore_finished_sync ( - SsoAuthService *proxy, - guchar *out_unnamed_arg0, - GCancellable *cancellable, - GError **error); - - - -/* ---- */ - -#define TYPE_SSO_AUTH_SERVICE_PROXY (sso_auth_service_proxy_get_type ()) -#define SSO_AUTH_SERVICE_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_AUTH_SERVICE_PROXY, SsoAuthServiceProxy)) -#define SSO_AUTH_SERVICE_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_SSO_AUTH_SERVICE_PROXY, SsoAuthServiceProxyClass)) -#define SSO_AUTH_SERVICE_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_SSO_AUTH_SERVICE_PROXY, SsoAuthServiceProxyClass)) -#define IS_SSO_AUTH_SERVICE_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_AUTH_SERVICE_PROXY)) -#define IS_SSO_AUTH_SERVICE_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_SSO_AUTH_SERVICE_PROXY)) - -typedef struct _SsoAuthServiceProxy SsoAuthServiceProxy; -typedef struct _SsoAuthServiceProxyClass SsoAuthServiceProxyClass; -typedef struct _SsoAuthServiceProxyPrivate SsoAuthServiceProxyPrivate; - -struct _SsoAuthServiceProxy -{ - /*< private >*/ - GDBusProxy parent_instance; - SsoAuthServiceProxyPrivate *priv; -}; - -struct _SsoAuthServiceProxyClass -{ - GDBusProxyClass parent_class; -}; - -GType sso_auth_service_proxy_get_type (void) G_GNUC_CONST; - -void sso_auth_service_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -SsoAuthService *sso_auth_service_proxy_new_finish ( - GAsyncResult *res, - GError **error); -SsoAuthService *sso_auth_service_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - -void sso_auth_service_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -SsoAuthService *sso_auth_service_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error); -SsoAuthService *sso_auth_service_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - - -/* ---- */ - -#define TYPE_SSO_AUTH_SERVICE_SKELETON (sso_auth_service_skeleton_get_type ()) -#define SSO_AUTH_SERVICE_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_AUTH_SERVICE_SKELETON, SsoAuthServiceSkeleton)) -#define SSO_AUTH_SERVICE_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_SSO_AUTH_SERVICE_SKELETON, SsoAuthServiceSkeletonClass)) -#define SSO_AUTH_SERVICE_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_SSO_AUTH_SERVICE_SKELETON, SsoAuthServiceSkeletonClass)) -#define IS_SSO_AUTH_SERVICE_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_AUTH_SERVICE_SKELETON)) -#define IS_SSO_AUTH_SERVICE_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_SSO_AUTH_SERVICE_SKELETON)) - -typedef struct _SsoAuthServiceSkeleton SsoAuthServiceSkeleton; -typedef struct _SsoAuthServiceSkeletonClass SsoAuthServiceSkeletonClass; -typedef struct _SsoAuthServiceSkeletonPrivate SsoAuthServiceSkeletonPrivate; - -struct _SsoAuthServiceSkeleton -{ - /*< private >*/ - GDBusInterfaceSkeleton parent_instance; - SsoAuthServiceSkeletonPrivate *priv; -}; - -struct _SsoAuthServiceSkeletonClass -{ - GDBusInterfaceSkeletonClass parent_class; -}; - -GType sso_auth_service_skeleton_get_type (void) G_GNUC_CONST; - -SsoAuthService *sso_auth_service_skeleton_new (void); - - -G_END_DECLS - -#endif /* __SSO_AUTH_SERVICE_GEN_H__ */ diff --git a/libgsignon-glib/sso-auth-session-gen.c b/libgsignon-glib/sso-auth-session-gen.c deleted file mode 100644 index 8b3cd34..0000000 --- a/libgsignon-glib/sso-auth-session-gen.c +++ /dev/null @@ -1,1591 +0,0 @@ -/* - * Generated by gdbus-codegen 2.32.4. DO NOT EDIT. - * - * The license of this code is the same as for the source it was derived from. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "sso-auth-session-gen.h" - -#include -#ifdef G_OS_UNIX -# include -#endif - -typedef struct -{ - GDBusArgInfo parent_struct; - gboolean use_gvariant; -} _ExtendedGDBusArgInfo; - -typedef struct -{ - GDBusMethodInfo parent_struct; - const gchar *signal_name; - gboolean pass_fdlist; -} _ExtendedGDBusMethodInfo; - -typedef struct -{ - GDBusSignalInfo parent_struct; - const gchar *signal_name; -} _ExtendedGDBusSignalInfo; - -typedef struct -{ - GDBusPropertyInfo parent_struct; - const gchar *hyphen_name; - gboolean use_gvariant; -} _ExtendedGDBusPropertyInfo; - -typedef struct -{ - GDBusInterfaceInfo parent_struct; - const gchar *hyphen_name; -} _ExtendedGDBusInterfaceInfo; - -typedef struct -{ - const _ExtendedGDBusPropertyInfo *info; - guint prop_id; - GValue orig_value; /* the value before the change */ -} ChangedProperty; - -static void -_changed_property_free (ChangedProperty *data) -{ - g_value_unset (&data->orig_value); - g_free (data); -} - -static gboolean -_g_strv_equal0 (gchar **a, gchar **b) -{ - gboolean ret = FALSE; - guint n; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - if (g_strv_length (a) != g_strv_length (b)) - goto out; - for (n = 0; a[n] != NULL; n++) - if (g_strcmp0 (a[n], b[n]) != 0) - goto out; - ret = TRUE; -out: - return ret; -} - -static gboolean -_g_variant_equal0 (GVariant *a, GVariant *b) -{ - gboolean ret = FALSE; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - ret = g_variant_equal (a, b); -out: - return ret; -} - -G_GNUC_UNUSED static gboolean -_g_value_equal (const GValue *a, const GValue *b) -{ - gboolean ret = FALSE; - g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b)); - switch (G_VALUE_TYPE (a)) - { - case G_TYPE_BOOLEAN: - ret = (g_value_get_boolean (a) == g_value_get_boolean (b)); - break; - case G_TYPE_UCHAR: - ret = (g_value_get_uchar (a) == g_value_get_uchar (b)); - break; - case G_TYPE_INT: - ret = (g_value_get_int (a) == g_value_get_int (b)); - break; - case G_TYPE_UINT: - ret = (g_value_get_uint (a) == g_value_get_uint (b)); - break; - case G_TYPE_INT64: - ret = (g_value_get_int64 (a) == g_value_get_int64 (b)); - break; - case G_TYPE_UINT64: - ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b)); - break; - case G_TYPE_DOUBLE: - { - /* Avoid -Wfloat-equal warnings by doing a direct bit compare */ - gdouble da = g_value_get_double (a); - gdouble db = g_value_get_double (b); - ret = memcmp (&da, &db, sizeof (gdouble)) == 0; - } - break; - case G_TYPE_STRING: - ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0); - break; - case G_TYPE_VARIANT: - ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b)); - break; - default: - if (G_VALUE_TYPE (a) == G_TYPE_STRV) - ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b)); - else - g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a))); - break; - } - return ret; -} - -/* ------------------------------------------------------------------------ - * Code for interface com.google.code.AccountsSSO.gSingleSignOn.AuthSession - * ------------------------------------------------------------------------ - */ - -/** - * SECTION:SsoAuthSession - * @title: SsoAuthSession - * @short_description: Generated C code for the com.google.code.AccountsSSO.gSingleSignOn.AuthSession D-Bus interface - * - * This section contains code for working with the com.google.code.AccountsSSO.gSingleSignOn.AuthSession D-Bus interface in C. - */ - -/* ---- Introspection data for com.google.code.AccountsSSO.gSingleSignOn.AuthSession ---- */ - -static const _ExtendedGDBusArgInfo _sso_auth_session_method_info_query_available_mechanisms_IN_ARG_wantedMechanisms = -{ - { - -1, - "wantedMechanisms", - "as", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_session_method_info_query_available_mechanisms_IN_ARG_pointers[] = -{ - &_sso_auth_session_method_info_query_available_mechanisms_IN_ARG_wantedMechanisms, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_auth_session_method_info_query_available_mechanisms_OUT_ARG_unnamed_arg1 = -{ - { - -1, - "unnamed_arg1", - "as", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_session_method_info_query_available_mechanisms_OUT_ARG_pointers[] = -{ - &_sso_auth_session_method_info_query_available_mechanisms_OUT_ARG_unnamed_arg1, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_session_method_info_query_available_mechanisms = -{ - { - -1, - "queryAvailableMechanisms", - (GDBusArgInfo **) &_sso_auth_session_method_info_query_available_mechanisms_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_auth_session_method_info_query_available_mechanisms_OUT_ARG_pointers, - NULL - }, - "handle-query-available-mechanisms", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_session_method_info_process_IN_ARG_sessionDataVa = -{ - { - -1, - "sessionDataVa", - "a{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_session_method_info_process_IN_ARG_mechanism = -{ - { - -1, - "mechanism", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_session_method_info_process_IN_ARG_pointers[] = -{ - &_sso_auth_session_method_info_process_IN_ARG_sessionDataVa, - &_sso_auth_session_method_info_process_IN_ARG_mechanism, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_auth_session_method_info_process_OUT_ARG_unnamed_arg2 = -{ - { - -1, - "unnamed_arg2", - "a{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_session_method_info_process_OUT_ARG_pointers[] = -{ - &_sso_auth_session_method_info_process_OUT_ARG_unnamed_arg2, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_session_method_info_process = -{ - { - -1, - "process", - (GDBusArgInfo **) &_sso_auth_session_method_info_process_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_auth_session_method_info_process_OUT_ARG_pointers, - NULL - }, - "handle-process", - FALSE -}; - -static const GDBusAnnotationInfo _sso_auth_session_method_cancel_annotation_info_0 = -{ - -1, - "org.freedesktop.DBus.Method.NoReply", - "true", - NULL -}; - -static const GDBusAnnotationInfo * const _sso_auth_session_method_cancel_annotation_info_pointers[] = -{ - &_sso_auth_session_method_cancel_annotation_info_0, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_auth_session_method_info_cancel = -{ - { - -1, - "cancel", - NULL, - NULL, - (GDBusAnnotationInfo **) &_sso_auth_session_method_cancel_annotation_info_pointers - }, - "handle-cancel", - FALSE -}; - -static const _ExtendedGDBusMethodInfo * const _sso_auth_session_method_info_pointers[] = -{ - &_sso_auth_session_method_info_query_available_mechanisms, - &_sso_auth_session_method_info_process, - &_sso_auth_session_method_info_cancel, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_auth_session_signal_info_state_changed_ARG_state = -{ - { - -1, - "state", - "i", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_auth_session_signal_info_state_changed_ARG_message = -{ - { - -1, - "message", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_auth_session_signal_info_state_changed_ARG_pointers[] = -{ - &_sso_auth_session_signal_info_state_changed_ARG_state, - &_sso_auth_session_signal_info_state_changed_ARG_message, - NULL -}; - -static const _ExtendedGDBusSignalInfo _sso_auth_session_signal_info_state_changed = -{ - { - -1, - "stateChanged", - (GDBusArgInfo **) &_sso_auth_session_signal_info_state_changed_ARG_pointers, - NULL - }, - "state-changed" -}; - -static const _ExtendedGDBusSignalInfo _sso_auth_session_signal_info_unregistered = -{ - { - -1, - "unregistered", - NULL, - NULL - }, - "unregistered" -}; - -static const _ExtendedGDBusSignalInfo * const _sso_auth_session_signal_info_pointers[] = -{ - &_sso_auth_session_signal_info_state_changed, - &_sso_auth_session_signal_info_unregistered, - NULL -}; - -static const _ExtendedGDBusInterfaceInfo _sso_auth_session_interface_info = -{ - { - -1, - "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", - (GDBusMethodInfo **) &_sso_auth_session_method_info_pointers, - (GDBusSignalInfo **) &_sso_auth_session_signal_info_pointers, - NULL, - NULL - }, - "sso-auth-session", -}; - - -/** - * sso_auth_session_interface_info: - * - * Gets a machine-readable description of the com.google.code.AccountsSSO.gSingleSignOn.AuthSession D-Bus interface. - * - * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. - */ -GDBusInterfaceInfo * -sso_auth_session_interface_info (void) -{ - return (GDBusInterfaceInfo *) &_sso_auth_session_interface_info; -} - -/** - * sso_auth_session_override_properties: - * @klass: The class structure for a #GObject-derived class. - * @property_id_begin: The property id to assign to the first overridden property. - * - * Overrides all #GObject properties in the #SsoAuthSession interface for a concrete class. - * The properties are overridden in the order they are defined. - * - * Returns: The last property id. - */ -guint -sso_auth_session_override_properties (GObjectClass *klass, guint property_id_begin) -{ - return property_id_begin - 1; -} - - - -/** - * SsoAuthSession: - * - * Abstract interface type for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthSession. - */ - -/** - * SsoAuthSessionIface: - * @parent_iface: The parent interface. - * @handle_cancel: Handler for the #SsoAuthSession::handle-cancel signal. - * @handle_process: Handler for the #SsoAuthSession::handle-process signal. - * @handle_query_available_mechanisms: Handler for the #SsoAuthSession::handle-query-available-mechanisms signal. - * @state_changed: Handler for the #SsoAuthSession::state-changed signal. - * @unregistered: Handler for the #SsoAuthSession::unregistered signal. - * - * Virtual table for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthSession. - */ - -static void -sso_auth_session_default_init (SsoAuthSessionIface *iface) -{ - /* GObject signals for incoming D-Bus method calls: */ - /** - * SsoAuthSession::handle-query-available-mechanisms: - * @object: A #SsoAuthSession. - * @invocation: A #GDBusMethodInvocation. - * @arg_wantedMechanisms: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the queryAvailableMechanisms() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_session_complete_query_available_mechanisms() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-query-available-mechanisms", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthSessionIface, handle_query_available_mechanisms), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRV); - - /** - * SsoAuthSession::handle-process: - * @object: A #SsoAuthSession. - * @invocation: A #GDBusMethodInvocation. - * @arg_sessionDataVa: Argument passed by remote caller. - * @arg_mechanism: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the process() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_session_complete_process() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-process", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthSessionIface, handle_process), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 3, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_VARIANT, G_TYPE_STRING); - - /** - * SsoAuthSession::handle-cancel: - * @object: A #SsoAuthSession. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the cancel() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_auth_session_complete_cancel() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-cancel", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthSessionIface, handle_cancel), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /* GObject signals for received D-Bus signals: */ - /** - * SsoAuthSession::state-changed: - * @object: A #SsoAuthSession. - * @arg_state: Argument. - * @arg_message: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "stateChanged" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - g_signal_new ("state-changed", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthSessionIface, state_changed), - NULL, - NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 2, G_TYPE_INT, G_TYPE_STRING); - - /** - * SsoAuthSession::unregistered: - * @object: A #SsoAuthSession. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "unregistered" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - g_signal_new ("unregistered", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoAuthSessionIface, unregistered), - NULL, - NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 0); - -} - -typedef SsoAuthSessionIface SsoAuthSessionInterface; -G_DEFINE_INTERFACE (SsoAuthSession, sso_auth_session, G_TYPE_OBJECT); - -/** - * sso_auth_session_emit_state_changed: - * @object: A #SsoAuthSession. - * @arg_state: Argument to pass with the signal. - * @arg_message: Argument to pass with the signal. - * - * Emits the "stateChanged" D-Bus signal. - */ -void -sso_auth_session_emit_state_changed ( - SsoAuthSession *object, - gint arg_state, - const gchar *arg_message) -{ - g_signal_emit_by_name (object, "state-changed", arg_state, arg_message); -} - -/** - * sso_auth_session_emit_unregistered: - * @object: A #SsoAuthSession. - * - * Emits the "unregistered" D-Bus signal. - */ -void -sso_auth_session_emit_unregistered ( - SsoAuthSession *object) -{ - g_signal_emit_by_name (object, "unregistered"); -} - -/** - * sso_auth_session_call_query_available_mechanisms: - * @proxy: A #SsoAuthSessionProxy. - * @arg_wantedMechanisms: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the queryAvailableMechanisms() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_session_call_query_available_mechanisms_finish() to get the result of the operation. - * - * See sso_auth_session_call_query_available_mechanisms_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_session_call_query_available_mechanisms ( - SsoAuthSession *proxy, - const gchar *const *arg_wantedMechanisms, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "queryAvailableMechanisms", - g_variant_new ("(^as)", - arg_wantedMechanisms), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_session_call_query_available_mechanisms_finish: - * @proxy: A #SsoAuthSessionProxy. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_session_call_query_available_mechanisms(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_session_call_query_available_mechanisms(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_session_call_query_available_mechanisms_finish ( - SsoAuthSession *proxy, - gchar ***out_unnamed_arg1, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(^as)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_session_call_query_available_mechanisms_sync: - * @proxy: A #SsoAuthSessionProxy. - * @arg_wantedMechanisms: Argument to pass with the method invocation. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the queryAvailableMechanisms() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_session_call_query_available_mechanisms() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_session_call_query_available_mechanisms_sync ( - SsoAuthSession *proxy, - const gchar *const *arg_wantedMechanisms, - gchar ***out_unnamed_arg1, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "queryAvailableMechanisms", - g_variant_new ("(^as)", - arg_wantedMechanisms), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(^as)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_session_call_process: - * @proxy: A #SsoAuthSessionProxy. - * @arg_sessionDataVa: Argument to pass with the method invocation. - * @arg_mechanism: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the process() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_session_call_process_finish() to get the result of the operation. - * - * See sso_auth_session_call_process_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_session_call_process ( - SsoAuthSession *proxy, - GVariant *arg_sessionDataVa, - const gchar *arg_mechanism, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "process", - g_variant_new ("(@a{sv}s)", - arg_sessionDataVa, - arg_mechanism), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_session_call_process_finish: - * @proxy: A #SsoAuthSessionProxy. - * @out_unnamed_arg2: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_session_call_process(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_session_call_process(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_session_call_process_finish ( - SsoAuthSession *proxy, - GVariant **out_unnamed_arg2, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(@a{sv})", - out_unnamed_arg2); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_session_call_process_sync: - * @proxy: A #SsoAuthSessionProxy. - * @arg_sessionDataVa: Argument to pass with the method invocation. - * @arg_mechanism: Argument to pass with the method invocation. - * @out_unnamed_arg2: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the process() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_session_call_process() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_session_call_process_sync ( - SsoAuthSession *proxy, - GVariant *arg_sessionDataVa, - const gchar *arg_mechanism, - GVariant **out_unnamed_arg2, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "process", - g_variant_new ("(@a{sv}s)", - arg_sessionDataVa, - arg_mechanism), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(@a{sv})", - out_unnamed_arg2); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_session_call_cancel: - * @proxy: A #SsoAuthSessionProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the cancel() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_session_call_cancel_finish() to get the result of the operation. - * - * See sso_auth_session_call_cancel_sync() for the synchronous, blocking version of this method. - */ -void -sso_auth_session_call_cancel ( - SsoAuthSession *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "cancel", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_auth_session_call_cancel_finish: - * @proxy: A #SsoAuthSessionProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_session_call_cancel(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_auth_session_call_cancel(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_session_call_cancel_finish ( - SsoAuthSession *proxy, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "()"); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_session_call_cancel_sync: - * @proxy: A #SsoAuthSessionProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the cancel() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_auth_session_call_cancel() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_auth_session_call_cancel_sync ( - SsoAuthSession *proxy, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "cancel", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "()"); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_auth_session_complete_query_available_mechanisms: - * @object: A #SsoAuthSession. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg1: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the queryAvailableMechanisms() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_session_complete_query_available_mechanisms ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation, - const gchar *const *unnamed_arg1) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(^as)", - unnamed_arg1)); -} - -/** - * sso_auth_session_complete_process: - * @object: A #SsoAuthSession. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg2: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the process() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_session_complete_process ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation, - GVariant *unnamed_arg2) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(@a{sv})", - unnamed_arg2)); -} - -/** - * sso_auth_session_complete_cancel: - * @object: A #SsoAuthSession. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the cancel() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_auth_session_complete_cancel ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("()")); -} - -/* ------------------------------------------------------------------------ */ - -/** - * SsoAuthSessionProxy: - * - * The #SsoAuthSessionProxy structure contains only private data and should only be accessed using the provided API. - */ - -/** - * SsoAuthSessionProxyClass: - * @parent_class: The parent class. - * - * Class structure for #SsoAuthSessionProxy. - */ - -struct _SsoAuthSessionProxyPrivate -{ - GData *qdata; -}; - -static void sso_auth_session_proxy_iface_init (SsoAuthSessionIface *iface); - -G_DEFINE_TYPE_WITH_CODE (SsoAuthSessionProxy, sso_auth_session_proxy, G_TYPE_DBUS_PROXY, - G_IMPLEMENT_INTERFACE (TYPE_SSO_AUTH_SESSION, sso_auth_session_proxy_iface_init)); - -static void -sso_auth_session_proxy_finalize (GObject *object) -{ - SsoAuthSessionProxy *proxy = SSO_AUTH_SESSION_PROXY (object); - g_datalist_clear (&proxy->priv->qdata); - G_OBJECT_CLASS (sso_auth_session_proxy_parent_class)->finalize (object); -} - -static void -sso_auth_session_proxy_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ -} - -static void -sso_auth_session_proxy_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ -} - -static void -sso_auth_session_proxy_g_signal (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, - GVariant *parameters) -{ - _ExtendedGDBusSignalInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - guint num_params; - guint n; - guint signal_id; - info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_sso_auth_session_interface_info, signal_name); - if (info == NULL) - return; - num_params = g_variant_n_children (parameters); - paramv = g_new0 (GValue, num_params + 1); - g_value_init (¶mv[0], TYPE_SSO_AUTH_SESSION); - g_value_set_object (¶mv[0], proxy); - g_variant_iter_init (&iter, parameters); - n = 1; - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_SSO_AUTH_SESSION); - g_signal_emitv (paramv, signal_id, 0, NULL); - for (n = 0; n < num_params + 1; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static void -sso_auth_session_proxy_g_properties_changed (GDBusProxy *_proxy, - GVariant *changed_properties, - const gchar *const *invalidated_properties) -{ - SsoAuthSessionProxy *proxy = SSO_AUTH_SESSION_PROXY (_proxy); - guint n; - const gchar *key; - GVariantIter *iter; - _ExtendedGDBusPropertyInfo *info; - g_variant_get (changed_properties, "a{sv}", &iter); - while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_session_interface_info, key); - g_datalist_remove_data (&proxy->priv->qdata, key); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } - g_variant_iter_free (iter); - for (n = 0; invalidated_properties[n] != NULL; n++) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_session_interface_info, invalidated_properties[n]); - g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } -} - -static void -sso_auth_session_proxy_init (SsoAuthSessionProxy *proxy) -{ - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_SSO_AUTH_SESSION_PROXY, SsoAuthSessionProxyPrivate); - g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), sso_auth_session_interface_info ()); -} - -static void -sso_auth_session_proxy_class_init (SsoAuthSessionProxyClass *klass) -{ - GObjectClass *gobject_class; - GDBusProxyClass *proxy_class; - - g_type_class_add_private (klass, sizeof (SsoAuthSessionProxyPrivate)); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = sso_auth_session_proxy_finalize; - gobject_class->get_property = sso_auth_session_proxy_get_property; - gobject_class->set_property = sso_auth_session_proxy_set_property; - - proxy_class = G_DBUS_PROXY_CLASS (klass); - proxy_class->g_signal = sso_auth_session_proxy_g_signal; - proxy_class->g_properties_changed = sso_auth_session_proxy_g_properties_changed; - -} - -static void -sso_auth_session_proxy_iface_init (SsoAuthSessionIface *iface) -{ -} - -/** - * sso_auth_session_proxy_new: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Asynchronously creates a proxy for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthSession. See g_dbus_proxy_new() for more details. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_session_proxy_new_finish() to get the result of the operation. - * - * See sso_auth_session_proxy_new_sync() for the synchronous, blocking version of this constructor. - */ -void -sso_auth_session_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_SSO_AUTH_SESSION_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", NULL); -} - -/** - * sso_auth_session_proxy_new_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_session_proxy_new(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with sso_auth_session_proxy_new(). - * - * Returns: (transfer full) (type SsoAuthSessionProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthSession * -sso_auth_session_proxy_new_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return SSO_AUTH_SESSION (ret); - else - return NULL; -} - -/** - * sso_auth_session_proxy_new_sync: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Synchronously creates a proxy for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthSession. See g_dbus_proxy_new_sync() for more details. - * - * The calling thread is blocked until a reply is received. - * - * See sso_auth_session_proxy_new() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type SsoAuthSessionProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthSession * -sso_auth_session_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_SSO_AUTH_SESSION_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", NULL); - if (ret != NULL) - return SSO_AUTH_SESSION (ret); - else - return NULL; -} - - -/** - * sso_auth_session_proxy_new_for_bus: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Like sso_auth_session_proxy_new() but takes a #GBusType instead of a #GDBusConnection. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_auth_session_proxy_new_for_bus_finish() to get the result of the operation. - * - * See sso_auth_session_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. - */ -void -sso_auth_session_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_SSO_AUTH_SESSION_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", NULL); -} - -/** - * sso_auth_session_proxy_new_for_bus_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_auth_session_proxy_new_for_bus(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with sso_auth_session_proxy_new_for_bus(). - * - * Returns: (transfer full) (type SsoAuthSessionProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthSession * -sso_auth_session_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return SSO_AUTH_SESSION (ret); - else - return NULL; -} - -/** - * sso_auth_session_proxy_new_for_bus_sync: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Like sso_auth_session_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. - * - * The calling thread is blocked until a reply is received. - * - * See sso_auth_session_proxy_new_for_bus() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type SsoAuthSessionProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoAuthSession * -sso_auth_session_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_SSO_AUTH_SESSION_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", NULL); - if (ret != NULL) - return SSO_AUTH_SESSION (ret); - else - return NULL; -} - - -/* ------------------------------------------------------------------------ */ - -/** - * SsoAuthSessionSkeleton: - * - * The #SsoAuthSessionSkeleton structure contains only private data and should only be accessed using the provided API. - */ - -/** - * SsoAuthSessionSkeletonClass: - * @parent_class: The parent class. - * - * Class structure for #SsoAuthSessionSkeleton. - */ - -struct _SsoAuthSessionSkeletonPrivate -{ - GValue *properties; - GList *changed_properties; - GSource *changed_properties_idle_source; - GMainContext *context; - GMutex lock; -}; - -static void -_sso_auth_session_skeleton_handle_method_call ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *method_name, - GVariant *parameters, - GDBusMethodInvocation *invocation, - gpointer user_data) -{ - SsoAuthSessionSkeleton *skeleton = SSO_AUTH_SESSION_SKELETON (user_data); - _ExtendedGDBusMethodInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - guint num_params; - guint num_extra; - guint n; - guint signal_id; - GValue return_value = G_VALUE_INIT; - info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); - g_assert (info != NULL); - num_params = g_variant_n_children (parameters); - num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); - n = 0; - g_value_init (¶mv[n], TYPE_SSO_AUTH_SESSION); - g_value_set_object (¶mv[n++], skeleton); - g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); - g_value_set_object (¶mv[n++], invocation); - if (info->pass_fdlist) - { -#ifdef G_OS_UNIX - g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); - g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); -#else - g_assert_not_reached (); -#endif - } - g_variant_iter_init (&iter, parameters); - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_SSO_AUTH_SESSION); - g_value_init (&return_value, G_TYPE_BOOLEAN); - g_signal_emitv (paramv, signal_id, 0, &return_value); - if (!g_value_get_boolean (&return_value)) - g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); - g_value_unset (&return_value); - for (n = 0; n < num_params + num_extra; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static GVariant * -_sso_auth_session_skeleton_handle_get_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GError **error, - gpointer user_data) -{ - SsoAuthSessionSkeleton *skeleton = SSO_AUTH_SESSION_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - GVariant *ret; - ret = NULL; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_session_interface_info, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); - ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); - g_value_unset (&value); - } - return ret; -} - -static gboolean -_sso_auth_session_skeleton_handle_set_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GVariant *variant, - GError **error, - gpointer user_data) -{ - SsoAuthSessionSkeleton *skeleton = SSO_AUTH_SESSION_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - gboolean ret; - ret = FALSE; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_auth_session_interface_info, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - if (info->use_gvariant) - g_value_set_variant (&value, variant); - else - g_dbus_gvariant_to_gvalue (variant, &value); - g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); - g_value_unset (&value); - ret = TRUE; - } - return ret; -} - -static const GDBusInterfaceVTable _sso_auth_session_skeleton_vtable = -{ - _sso_auth_session_skeleton_handle_method_call, - _sso_auth_session_skeleton_handle_get_property, - _sso_auth_session_skeleton_handle_set_property -}; - -static GDBusInterfaceInfo * -sso_auth_session_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton) -{ - return sso_auth_session_interface_info (); -} - -static GDBusInterfaceVTable * -sso_auth_session_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton) -{ - return (GDBusInterfaceVTable *) &_sso_auth_session_skeleton_vtable; -} - -static GVariant * -sso_auth_session_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) -{ - SsoAuthSessionSkeleton *skeleton = SSO_AUTH_SESSION_SKELETON (_skeleton); - - GVariantBuilder builder; - guint n; - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); - if (_sso_auth_session_interface_info.parent_struct.properties == NULL) - goto out; - for (n = 0; _sso_auth_session_interface_info.parent_struct.properties[n] != NULL; n++) - { - GDBusPropertyInfo *info = _sso_auth_session_interface_info.parent_struct.properties[n]; - if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) - { - GVariant *value; - value = _sso_auth_session_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", info->name, NULL, skeleton); - if (value != NULL) - { - g_variant_take_ref (value); - g_variant_builder_add (&builder, "{sv}", info->name, value); - g_variant_unref (value); - } - } - } -out: - return g_variant_builder_end (&builder); -} - -static void -sso_auth_session_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) -{ -} - -static void -_sso_auth_session_on_signal_state_changed ( - SsoAuthSession *object, - gint arg_state, - const gchar *arg_message) -{ - SsoAuthSessionSkeleton *skeleton = SSO_AUTH_SESSION_SKELETON (object); - - GList *connections, *l; - GVariant *signal_variant; - connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); - - signal_variant = g_variant_ref_sink (g_variant_new ("(is)", - arg_state, - arg_message)); - for (l = connections; l != NULL; l = l->next) - { - GDBusConnection *connection = l->data; - g_dbus_connection_emit_signal (connection, - NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", "stateChanged", - signal_variant, NULL); - } - g_variant_unref (signal_variant); - g_list_free_full (connections, g_object_unref); -} - -static void -_sso_auth_session_on_signal_unregistered ( - SsoAuthSession *object) -{ - SsoAuthSessionSkeleton *skeleton = SSO_AUTH_SESSION_SKELETON (object); - - GList *connections, *l; - GVariant *signal_variant; - connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); - - signal_variant = g_variant_ref_sink (g_variant_new ("()")); - for (l = connections; l != NULL; l = l->next) - { - GDBusConnection *connection = l->data; - g_dbus_connection_emit_signal (connection, - NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "com.google.code.AccountsSSO.gSingleSignOn.AuthSession", "unregistered", - signal_variant, NULL); - } - g_variant_unref (signal_variant); - g_list_free_full (connections, g_object_unref); -} - -static void sso_auth_session_skeleton_iface_init (SsoAuthSessionIface *iface); -G_DEFINE_TYPE_WITH_CODE (SsoAuthSessionSkeleton, sso_auth_session_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, - G_IMPLEMENT_INTERFACE (TYPE_SSO_AUTH_SESSION, sso_auth_session_skeleton_iface_init)); - -static void -sso_auth_session_skeleton_finalize (GObject *object) -{ - SsoAuthSessionSkeleton *skeleton = SSO_AUTH_SESSION_SKELETON (object); - g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); - if (skeleton->priv->changed_properties_idle_source != NULL) - g_source_destroy (skeleton->priv->changed_properties_idle_source); - g_main_context_unref (skeleton->priv->context); - g_mutex_clear (&skeleton->priv->lock); - G_OBJECT_CLASS (sso_auth_session_skeleton_parent_class)->finalize (object); -} - -static void -sso_auth_session_skeleton_init (SsoAuthSessionSkeleton *skeleton) -{ - skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_SSO_AUTH_SESSION_SKELETON, SsoAuthSessionSkeletonPrivate); - g_mutex_init (&skeleton->priv->lock); - skeleton->priv->context = g_main_context_ref_thread_default (); -} - -static void -sso_auth_session_skeleton_class_init (SsoAuthSessionSkeletonClass *klass) -{ - GObjectClass *gobject_class; - GDBusInterfaceSkeletonClass *skeleton_class; - - g_type_class_add_private (klass, sizeof (SsoAuthSessionSkeletonPrivate)); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = sso_auth_session_skeleton_finalize; - - skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); - skeleton_class->get_info = sso_auth_session_skeleton_dbus_interface_get_info; - skeleton_class->get_properties = sso_auth_session_skeleton_dbus_interface_get_properties; - skeleton_class->flush = sso_auth_session_skeleton_dbus_interface_flush; - skeleton_class->get_vtable = sso_auth_session_skeleton_dbus_interface_get_vtable; -} - -static void -sso_auth_session_skeleton_iface_init (SsoAuthSessionIface *iface) -{ - iface->state_changed = _sso_auth_session_on_signal_state_changed; - iface->unregistered = _sso_auth_session_on_signal_unregistered; -} - -/** - * sso_auth_session_skeleton_new: - * - * Creates a skeleton object for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.AuthSession. - * - * Returns: (transfer full) (type SsoAuthSessionSkeleton): The skeleton object. - */ -SsoAuthSession * -sso_auth_session_skeleton_new (void) -{ - return SSO_AUTH_SESSION (g_object_new (TYPE_SSO_AUTH_SESSION_SKELETON, NULL)); -} - diff --git a/libgsignon-glib/sso-auth-session-gen.h b/libgsignon-glib/sso-auth-session-gen.h deleted file mode 100644 index 74fb54c..0000000 --- a/libgsignon-glib/sso-auth-session-gen.h +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Generated by gdbus-codegen 2.32.4. DO NOT EDIT. - * - * The license of this code is the same as for the source it was derived from. - */ - -#ifndef __SSO_AUTH_SESSION_GEN_H__ -#define __SSO_AUTH_SESSION_GEN_H__ - -#include - -G_BEGIN_DECLS - - -/* ------------------------------------------------------------------------ */ -/* Declarations for com.google.code.AccountsSSO.gSingleSignOn.AuthSession */ - -#define TYPE_SSO_AUTH_SESSION (sso_auth_session_get_type ()) -#define SSO_AUTH_SESSION(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_AUTH_SESSION, SsoAuthSession)) -#define IS_SSO_AUTH_SESSION(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_AUTH_SESSION)) -#define SSO_AUTH_SESSION_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_SSO_AUTH_SESSION, SsoAuthSessionIface)) - -struct _SsoAuthSession; -typedef struct _SsoAuthSession SsoAuthSession; -typedef struct _SsoAuthSessionIface SsoAuthSessionIface; - -struct _SsoAuthSessionIface -{ - GTypeInterface parent_iface; - - - gboolean (*handle_cancel) ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_process) ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation, - GVariant *arg_sessionDataVa, - const gchar *arg_mechanism); - - gboolean (*handle_query_available_mechanisms) ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation, - const gchar *const *arg_wantedMechanisms); - - void (*state_changed) ( - SsoAuthSession *object, - gint arg_state, - const gchar *arg_message); - - void (*unregistered) ( - SsoAuthSession *object); - -}; - -GType sso_auth_session_get_type (void) G_GNUC_CONST; - -GDBusInterfaceInfo *sso_auth_session_interface_info (void); -guint sso_auth_session_override_properties (GObjectClass *klass, guint property_id_begin); - - -/* D-Bus method call completion functions: */ -void sso_auth_session_complete_query_available_mechanisms ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation, - const gchar *const *unnamed_arg1); - -void sso_auth_session_complete_process ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation, - GVariant *unnamed_arg2); - -void sso_auth_session_complete_cancel ( - SsoAuthSession *object, - GDBusMethodInvocation *invocation); - - - -/* D-Bus signal emissions functions: */ -void sso_auth_session_emit_state_changed ( - SsoAuthSession *object, - gint arg_state, - const gchar *arg_message); - -void sso_auth_session_emit_unregistered ( - SsoAuthSession *object); - - - -/* D-Bus method calls: */ -void sso_auth_session_call_query_available_mechanisms ( - SsoAuthSession *proxy, - const gchar *const *arg_wantedMechanisms, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_session_call_query_available_mechanisms_finish ( - SsoAuthSession *proxy, - gchar ***out_unnamed_arg1, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_session_call_query_available_mechanisms_sync ( - SsoAuthSession *proxy, - const gchar *const *arg_wantedMechanisms, - gchar ***out_unnamed_arg1, - GCancellable *cancellable, - GError **error); - -void sso_auth_session_call_process ( - SsoAuthSession *proxy, - GVariant *arg_sessionDataVa, - const gchar *arg_mechanism, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_session_call_process_finish ( - SsoAuthSession *proxy, - GVariant **out_unnamed_arg2, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_session_call_process_sync ( - SsoAuthSession *proxy, - GVariant *arg_sessionDataVa, - const gchar *arg_mechanism, - GVariant **out_unnamed_arg2, - GCancellable *cancellable, - GError **error); - -void sso_auth_session_call_cancel ( - SsoAuthSession *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_auth_session_call_cancel_finish ( - SsoAuthSession *proxy, - GAsyncResult *res, - GError **error); - -gboolean sso_auth_session_call_cancel_sync ( - SsoAuthSession *proxy, - GCancellable *cancellable, - GError **error); - - - -/* ---- */ - -#define TYPE_SSO_AUTH_SESSION_PROXY (sso_auth_session_proxy_get_type ()) -#define SSO_AUTH_SESSION_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_AUTH_SESSION_PROXY, SsoAuthSessionProxy)) -#define SSO_AUTH_SESSION_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_SSO_AUTH_SESSION_PROXY, SsoAuthSessionProxyClass)) -#define SSO_AUTH_SESSION_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_SSO_AUTH_SESSION_PROXY, SsoAuthSessionProxyClass)) -#define IS_SSO_AUTH_SESSION_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_AUTH_SESSION_PROXY)) -#define IS_SSO_AUTH_SESSION_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_SSO_AUTH_SESSION_PROXY)) - -typedef struct _SsoAuthSessionProxy SsoAuthSessionProxy; -typedef struct _SsoAuthSessionProxyClass SsoAuthSessionProxyClass; -typedef struct _SsoAuthSessionProxyPrivate SsoAuthSessionProxyPrivate; - -struct _SsoAuthSessionProxy -{ - /*< private >*/ - GDBusProxy parent_instance; - SsoAuthSessionProxyPrivate *priv; -}; - -struct _SsoAuthSessionProxyClass -{ - GDBusProxyClass parent_class; -}; - -GType sso_auth_session_proxy_get_type (void) G_GNUC_CONST; - -void sso_auth_session_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -SsoAuthSession *sso_auth_session_proxy_new_finish ( - GAsyncResult *res, - GError **error); -SsoAuthSession *sso_auth_session_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - -void sso_auth_session_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -SsoAuthSession *sso_auth_session_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error); -SsoAuthSession *sso_auth_session_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - - -/* ---- */ - -#define TYPE_SSO_AUTH_SESSION_SKELETON (sso_auth_session_skeleton_get_type ()) -#define SSO_AUTH_SESSION_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_AUTH_SESSION_SKELETON, SsoAuthSessionSkeleton)) -#define SSO_AUTH_SESSION_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_SSO_AUTH_SESSION_SKELETON, SsoAuthSessionSkeletonClass)) -#define SSO_AUTH_SESSION_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_SSO_AUTH_SESSION_SKELETON, SsoAuthSessionSkeletonClass)) -#define IS_SSO_AUTH_SESSION_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_AUTH_SESSION_SKELETON)) -#define IS_SSO_AUTH_SESSION_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_SSO_AUTH_SESSION_SKELETON)) - -typedef struct _SsoAuthSessionSkeleton SsoAuthSessionSkeleton; -typedef struct _SsoAuthSessionSkeletonClass SsoAuthSessionSkeletonClass; -typedef struct _SsoAuthSessionSkeletonPrivate SsoAuthSessionSkeletonPrivate; - -struct _SsoAuthSessionSkeleton -{ - /*< private >*/ - GDBusInterfaceSkeleton parent_instance; - SsoAuthSessionSkeletonPrivate *priv; -}; - -struct _SsoAuthSessionSkeletonClass -{ - GDBusInterfaceSkeletonClass parent_class; -}; - -GType sso_auth_session_skeleton_get_type (void) G_GNUC_CONST; - -SsoAuthSession *sso_auth_session_skeleton_new (void); - - -G_END_DECLS - -#endif /* __SSO_AUTH_SESSION_GEN_H__ */ diff --git a/libgsignon-glib/sso-identity-gen.c b/libgsignon-glib/sso-identity-gen.c deleted file mode 100644 index ba10501..0000000 --- a/libgsignon-glib/sso-identity-gen.c +++ /dev/null @@ -1,2872 +0,0 @@ -/* - * Generated by gdbus-codegen 2.32.4. DO NOT EDIT. - * - * The license of this code is the same as for the source it was derived from. - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - -#include "sso-identity-gen.h" - -#include -#ifdef G_OS_UNIX -# include -#endif - -typedef struct -{ - GDBusArgInfo parent_struct; - gboolean use_gvariant; -} _ExtendedGDBusArgInfo; - -typedef struct -{ - GDBusMethodInfo parent_struct; - const gchar *signal_name; - gboolean pass_fdlist; -} _ExtendedGDBusMethodInfo; - -typedef struct -{ - GDBusSignalInfo parent_struct; - const gchar *signal_name; -} _ExtendedGDBusSignalInfo; - -typedef struct -{ - GDBusPropertyInfo parent_struct; - const gchar *hyphen_name; - gboolean use_gvariant; -} _ExtendedGDBusPropertyInfo; - -typedef struct -{ - GDBusInterfaceInfo parent_struct; - const gchar *hyphen_name; -} _ExtendedGDBusInterfaceInfo; - -typedef struct -{ - const _ExtendedGDBusPropertyInfo *info; - guint prop_id; - GValue orig_value; /* the value before the change */ -} ChangedProperty; - -static void -_changed_property_free (ChangedProperty *data) -{ - g_value_unset (&data->orig_value); - g_free (data); -} - -static gboolean -_g_strv_equal0 (gchar **a, gchar **b) -{ - gboolean ret = FALSE; - guint n; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - if (g_strv_length (a) != g_strv_length (b)) - goto out; - for (n = 0; a[n] != NULL; n++) - if (g_strcmp0 (a[n], b[n]) != 0) - goto out; - ret = TRUE; -out: - return ret; -} - -static gboolean -_g_variant_equal0 (GVariant *a, GVariant *b) -{ - gboolean ret = FALSE; - if (a == NULL && b == NULL) - { - ret = TRUE; - goto out; - } - if (a == NULL || b == NULL) - goto out; - ret = g_variant_equal (a, b); -out: - return ret; -} - -G_GNUC_UNUSED static gboolean -_g_value_equal (const GValue *a, const GValue *b) -{ - gboolean ret = FALSE; - g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b)); - switch (G_VALUE_TYPE (a)) - { - case G_TYPE_BOOLEAN: - ret = (g_value_get_boolean (a) == g_value_get_boolean (b)); - break; - case G_TYPE_UCHAR: - ret = (g_value_get_uchar (a) == g_value_get_uchar (b)); - break; - case G_TYPE_INT: - ret = (g_value_get_int (a) == g_value_get_int (b)); - break; - case G_TYPE_UINT: - ret = (g_value_get_uint (a) == g_value_get_uint (b)); - break; - case G_TYPE_INT64: - ret = (g_value_get_int64 (a) == g_value_get_int64 (b)); - break; - case G_TYPE_UINT64: - ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b)); - break; - case G_TYPE_DOUBLE: - { - /* Avoid -Wfloat-equal warnings by doing a direct bit compare */ - gdouble da = g_value_get_double (a); - gdouble db = g_value_get_double (b); - ret = memcmp (&da, &db, sizeof (gdouble)) == 0; - } - break; - case G_TYPE_STRING: - ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0); - break; - case G_TYPE_VARIANT: - ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b)); - break; - default: - if (G_VALUE_TYPE (a) == G_TYPE_STRV) - ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b)); - else - g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a))); - break; - } - return ret; -} - -/* ------------------------------------------------------------------------ - * Code for interface com.google.code.AccountsSSO.gSingleSignOn.Identity - * ------------------------------------------------------------------------ - */ - -/** - * SECTION:SsoIdentity - * @title: SsoIdentity - * @short_description: Generated C code for the com.google.code.AccountsSSO.gSingleSignOn.Identity D-Bus interface - * - * This section contains code for working with the com.google.code.AccountsSSO.gSingleSignOn.Identity D-Bus interface in C. - */ - -/* ---- Introspection data for com.google.code.AccountsSSO.gSingleSignOn.Identity ---- */ - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_request_credentials_update_IN_ARG_message = -{ - { - -1, - "message", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_request_credentials_update_IN_ARG_pointers[] = -{ - &_sso_identity_method_info_request_credentials_update_IN_ARG_message, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_request_credentials_update_OUT_ARG_unnamed_arg1 = -{ - { - -1, - "unnamed_arg1", - "u", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_request_credentials_update_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_request_credentials_update_OUT_ARG_unnamed_arg1, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_request_credentials_update = -{ - { - -1, - "requestCredentialsUpdate", - (GDBusArgInfo **) &_sso_identity_method_info_request_credentials_update_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_identity_method_info_request_credentials_update_OUT_ARG_pointers, - NULL - }, - "handle-request-credentials-update", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_get_info_OUT_ARG_identityInfo = -{ - { - -1, - "identityInfo", - "a{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_get_info_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_get_info_OUT_ARG_identityInfo, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_get_info = -{ - { - -1, - "getInfo", - NULL, - (GDBusArgInfo **) &_sso_identity_method_info_get_info_OUT_ARG_pointers, - NULL - }, - "handle-get-info", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_get_auth_session_IN_ARG_method = -{ - { - -1, - "method", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_get_auth_session_IN_ARG_pointers[] = -{ - &_sso_identity_method_info_get_auth_session_IN_ARG_method, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_get_auth_session_OUT_ARG_objectPath = -{ - { - -1, - "objectPath", - "o", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_get_auth_session_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_get_auth_session_OUT_ARG_objectPath, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_get_auth_session = -{ - { - -1, - "getAuthSession", - (GDBusArgInfo **) &_sso_identity_method_info_get_auth_session_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_identity_method_info_get_auth_session_OUT_ARG_pointers, - NULL - }, - "handle-get-auth-session", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_verify_user_IN_ARG_params = -{ - { - -1, - "params", - "a{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_verify_user_IN_ARG_pointers[] = -{ - &_sso_identity_method_info_verify_user_IN_ARG_params, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_verify_user_OUT_ARG_unnamed_arg1 = -{ - { - -1, - "unnamed_arg1", - "b", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_verify_user_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_verify_user_OUT_ARG_unnamed_arg1, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_verify_user = -{ - { - -1, - "verifyUser", - (GDBusArgInfo **) &_sso_identity_method_info_verify_user_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_identity_method_info_verify_user_OUT_ARG_pointers, - NULL - }, - "handle-verify-user", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_verify_secret_IN_ARG_secret = -{ - { - -1, - "secret", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_verify_secret_IN_ARG_pointers[] = -{ - &_sso_identity_method_info_verify_secret_IN_ARG_secret, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_verify_secret_OUT_ARG_unnamed_arg1 = -{ - { - -1, - "unnamed_arg1", - "b", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_verify_secret_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_verify_secret_OUT_ARG_unnamed_arg1, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_verify_secret = -{ - { - -1, - "verifySecret", - (GDBusArgInfo **) &_sso_identity_method_info_verify_secret_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_identity_method_info_verify_secret_OUT_ARG_pointers, - NULL - }, - "handle-verify-secret", - FALSE -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_remove = -{ - { - -1, - "remove", - NULL, - NULL, - NULL - }, - "handle-remove", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_sign_out_OUT_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "b", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_sign_out_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_sign_out_OUT_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_sign_out = -{ - { - -1, - "signOut", - NULL, - (GDBusArgInfo **) &_sso_identity_method_info_sign_out_OUT_ARG_pointers, - NULL - }, - "handle-sign-out", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_store_IN_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "a{sv}", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_store_IN_ARG_pointers[] = -{ - &_sso_identity_method_info_store_IN_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_store_OUT_ARG_unnamed_arg1 = -{ - { - -1, - "unnamed_arg1", - "u", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_store_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_store_OUT_ARG_unnamed_arg1, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_store = -{ - { - -1, - "store", - (GDBusArgInfo **) &_sso_identity_method_info_store_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_identity_method_info_store_OUT_ARG_pointers, - NULL - }, - "handle-store", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_add_reference_IN_ARG_reference = -{ - { - -1, - "reference", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_add_reference_IN_ARG_pointers[] = -{ - &_sso_identity_method_info_add_reference_IN_ARG_reference, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_add_reference_OUT_ARG_unnamed_arg1 = -{ - { - -1, - "unnamed_arg1", - "i", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_add_reference_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_add_reference_OUT_ARG_unnamed_arg1, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_add_reference = -{ - { - -1, - "addReference", - (GDBusArgInfo **) &_sso_identity_method_info_add_reference_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_identity_method_info_add_reference_OUT_ARG_pointers, - NULL - }, - "handle-add-reference", - FALSE -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_remove_reference_IN_ARG_reference = -{ - { - -1, - "reference", - "s", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_remove_reference_IN_ARG_pointers[] = -{ - &_sso_identity_method_info_remove_reference_IN_ARG_reference, - NULL -}; - -static const _ExtendedGDBusArgInfo _sso_identity_method_info_remove_reference_OUT_ARG_unnamed_arg1 = -{ - { - -1, - "unnamed_arg1", - "i", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_method_info_remove_reference_OUT_ARG_pointers[] = -{ - &_sso_identity_method_info_remove_reference_OUT_ARG_unnamed_arg1, - NULL -}; - -static const _ExtendedGDBusMethodInfo _sso_identity_method_info_remove_reference = -{ - { - -1, - "removeReference", - (GDBusArgInfo **) &_sso_identity_method_info_remove_reference_IN_ARG_pointers, - (GDBusArgInfo **) &_sso_identity_method_info_remove_reference_OUT_ARG_pointers, - NULL - }, - "handle-remove-reference", - FALSE -}; - -static const _ExtendedGDBusMethodInfo * const _sso_identity_method_info_pointers[] = -{ - &_sso_identity_method_info_request_credentials_update, - &_sso_identity_method_info_get_info, - &_sso_identity_method_info_get_auth_session, - &_sso_identity_method_info_verify_user, - &_sso_identity_method_info_verify_secret, - &_sso_identity_method_info_remove, - &_sso_identity_method_info_sign_out, - &_sso_identity_method_info_store, - &_sso_identity_method_info_add_reference, - &_sso_identity_method_info_remove_reference, - NULL -}; - -static const _ExtendedGDBusSignalInfo _sso_identity_signal_info_unregistered = -{ - { - -1, - "unregistered", - NULL, - NULL - }, - "unregistered" -}; - -static const _ExtendedGDBusArgInfo _sso_identity_signal_info_info_updated_ARG_unnamed_arg0 = -{ - { - -1, - "unnamed_arg0", - "i", - NULL - }, - FALSE -}; - -static const _ExtendedGDBusArgInfo * const _sso_identity_signal_info_info_updated_ARG_pointers[] = -{ - &_sso_identity_signal_info_info_updated_ARG_unnamed_arg0, - NULL -}; - -static const _ExtendedGDBusSignalInfo _sso_identity_signal_info_info_updated = -{ - { - -1, - "infoUpdated", - (GDBusArgInfo **) &_sso_identity_signal_info_info_updated_ARG_pointers, - NULL - }, - "info-updated" -}; - -static const _ExtendedGDBusSignalInfo * const _sso_identity_signal_info_pointers[] = -{ - &_sso_identity_signal_info_unregistered, - &_sso_identity_signal_info_info_updated, - NULL -}; - -static const _ExtendedGDBusInterfaceInfo _sso_identity_interface_info = -{ - { - -1, - "com.google.code.AccountsSSO.gSingleSignOn.Identity", - (GDBusMethodInfo **) &_sso_identity_method_info_pointers, - (GDBusSignalInfo **) &_sso_identity_signal_info_pointers, - NULL, - NULL - }, - "sso-identity", -}; - - -/** - * sso_identity_interface_info: - * - * Gets a machine-readable description of the com.google.code.AccountsSSO.gSingleSignOn.Identity D-Bus interface. - * - * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. - */ -GDBusInterfaceInfo * -sso_identity_interface_info (void) -{ - return (GDBusInterfaceInfo *) &_sso_identity_interface_info; -} - -/** - * sso_identity_override_properties: - * @klass: The class structure for a #GObject-derived class. - * @property_id_begin: The property id to assign to the first overridden property. - * - * Overrides all #GObject properties in the #SsoIdentity interface for a concrete class. - * The properties are overridden in the order they are defined. - * - * Returns: The last property id. - */ -guint -sso_identity_override_properties (GObjectClass *klass, guint property_id_begin) -{ - return property_id_begin - 1; -} - - - -/** - * SsoIdentity: - * - * Abstract interface type for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.Identity. - */ - -/** - * SsoIdentityIface: - * @parent_iface: The parent interface. - * @handle_add_reference: Handler for the #SsoIdentity::handle-add-reference signal. - * @handle_get_auth_session: Handler for the #SsoIdentity::handle-get-auth-session signal. - * @handle_get_info: Handler for the #SsoIdentity::handle-get-info signal. - * @handle_remove: Handler for the #SsoIdentity::handle-remove signal. - * @handle_remove_reference: Handler for the #SsoIdentity::handle-remove-reference signal. - * @handle_request_credentials_update: Handler for the #SsoIdentity::handle-request-credentials-update signal. - * @handle_sign_out: Handler for the #SsoIdentity::handle-sign-out signal. - * @handle_store: Handler for the #SsoIdentity::handle-store signal. - * @handle_verify_secret: Handler for the #SsoIdentity::handle-verify-secret signal. - * @handle_verify_user: Handler for the #SsoIdentity::handle-verify-user signal. - * @info_updated: Handler for the #SsoIdentity::info-updated signal. - * @unregistered: Handler for the #SsoIdentity::unregistered signal. - * - * Virtual table for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.Identity. - */ - -static void -sso_identity_default_init (SsoIdentityIface *iface) -{ - /* GObject signals for incoming D-Bus method calls: */ - /** - * SsoIdentity::handle-request-credentials-update: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * @arg_message: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the requestCredentialsUpdate() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_request_credentials_update() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-request-credentials-update", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_request_credentials_update), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); - - /** - * SsoIdentity::handle-get-info: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the getInfo() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_get_info() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-get-info", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_get_info), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoIdentity::handle-get-auth-session: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * @arg_method: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the getAuthSession() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_get_auth_session() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-get-auth-session", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_get_auth_session), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); - - /** - * SsoIdentity::handle-verify-user: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * @arg_params: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the verifyUser() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_verify_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-verify-user", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_verify_user), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_VARIANT); - - /** - * SsoIdentity::handle-verify-secret: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * @arg_secret: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the verifySecret() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_verify_secret() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-verify-secret", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_verify_secret), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); - - /** - * SsoIdentity::handle-remove: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the remove() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_remove() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-remove", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_remove), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoIdentity::handle-sign-out: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the signOut() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_sign_out() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-sign-out", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_sign_out), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 1, - G_TYPE_DBUS_METHOD_INVOCATION); - - /** - * SsoIdentity::handle-store: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * @arg_unnamed_arg0: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the store() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_store() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-store", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_store), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_VARIANT); - - /** - * SsoIdentity::handle-add-reference: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * @arg_reference: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the addReference() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_add_reference() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-add-reference", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_add_reference), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); - - /** - * SsoIdentity::handle-remove-reference: - * @object: A #SsoIdentity. - * @invocation: A #GDBusMethodInvocation. - * @arg_reference: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the removeReference() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call sso_identity_complete_remove_reference() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - g_signal_new ("handle-remove-reference", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, handle_remove_reference), - g_signal_accumulator_true_handled, - NULL, - g_cclosure_marshal_generic, - G_TYPE_BOOLEAN, - 2, - G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING); - - /* GObject signals for received D-Bus signals: */ - /** - * SsoIdentity::unregistered: - * @object: A #SsoIdentity. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "unregistered" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - g_signal_new ("unregistered", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, unregistered), - NULL, - NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 0); - - /** - * SsoIdentity::info-updated: - * @object: A #SsoIdentity. - * @arg_unnamed_arg0: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "infoUpdated" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - g_signal_new ("info-updated", - G_TYPE_FROM_INTERFACE (iface), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (SsoIdentityIface, info_updated), - NULL, - NULL, - g_cclosure_marshal_generic, - G_TYPE_NONE, - 1, G_TYPE_INT); - -} - -typedef SsoIdentityIface SsoIdentityInterface; -G_DEFINE_INTERFACE (SsoIdentity, sso_identity, G_TYPE_OBJECT); - -/** - * sso_identity_emit_unregistered: - * @object: A #SsoIdentity. - * - * Emits the "unregistered" D-Bus signal. - */ -void -sso_identity_emit_unregistered ( - SsoIdentity *object) -{ - g_signal_emit_by_name (object, "unregistered"); -} - -/** - * sso_identity_emit_info_updated: - * @object: A #SsoIdentity. - * @arg_unnamed_arg0: Argument to pass with the signal. - * - * Emits the "infoUpdated" D-Bus signal. - */ -void -sso_identity_emit_info_updated ( - SsoIdentity *object, - gint arg_unnamed_arg0) -{ - g_signal_emit_by_name (object, "info-updated", arg_unnamed_arg0); -} - -/** - * sso_identity_call_request_credentials_update: - * @proxy: A #SsoIdentityProxy. - * @arg_message: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the requestCredentialsUpdate() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_request_credentials_update_finish() to get the result of the operation. - * - * See sso_identity_call_request_credentials_update_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_request_credentials_update ( - SsoIdentity *proxy, - const gchar *arg_message, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "requestCredentialsUpdate", - g_variant_new ("(s)", - arg_message), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_request_credentials_update_finish: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_request_credentials_update(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_request_credentials_update(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_request_credentials_update_finish ( - SsoIdentity *proxy, - guint *out_unnamed_arg1, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(u)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_request_credentials_update_sync: - * @proxy: A #SsoIdentityProxy. - * @arg_message: Argument to pass with the method invocation. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the requestCredentialsUpdate() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_request_credentials_update() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_request_credentials_update_sync ( - SsoIdentity *proxy, - const gchar *arg_message, - guint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "requestCredentialsUpdate", - g_variant_new ("(s)", - arg_message), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(u)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_get_info: - * @proxy: A #SsoIdentityProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the getInfo() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_get_info_finish() to get the result of the operation. - * - * See sso_identity_call_get_info_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_get_info ( - SsoIdentity *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "getInfo", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_get_info_finish: - * @proxy: A #SsoIdentityProxy. - * @out_identityInfo: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_get_info(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_get_info(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_get_info_finish ( - SsoIdentity *proxy, - GVariant **out_identityInfo, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(@a{sv})", - out_identityInfo); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_get_info_sync: - * @proxy: A #SsoIdentityProxy. - * @out_identityInfo: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the getInfo() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_get_info() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_get_info_sync ( - SsoIdentity *proxy, - GVariant **out_identityInfo, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "getInfo", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(@a{sv})", - out_identityInfo); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_get_auth_session: - * @proxy: A #SsoIdentityProxy. - * @arg_method: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the getAuthSession() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_get_auth_session_finish() to get the result of the operation. - * - * See sso_identity_call_get_auth_session_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_get_auth_session ( - SsoIdentity *proxy, - const gchar *arg_method, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "getAuthSession", - g_variant_new ("(s)", - arg_method), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_get_auth_session_finish: - * @proxy: A #SsoIdentityProxy. - * @out_objectPath: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_get_auth_session(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_get_auth_session(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_get_auth_session_finish ( - SsoIdentity *proxy, - gchar **out_objectPath, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(o)", - out_objectPath); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_get_auth_session_sync: - * @proxy: A #SsoIdentityProxy. - * @arg_method: Argument to pass with the method invocation. - * @out_objectPath: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the getAuthSession() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_get_auth_session() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_get_auth_session_sync ( - SsoIdentity *proxy, - const gchar *arg_method, - gchar **out_objectPath, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "getAuthSession", - g_variant_new ("(s)", - arg_method), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(o)", - out_objectPath); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_verify_user: - * @proxy: A #SsoIdentityProxy. - * @arg_params: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the verifyUser() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_verify_user_finish() to get the result of the operation. - * - * See sso_identity_call_verify_user_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_verify_user ( - SsoIdentity *proxy, - GVariant *arg_params, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "verifyUser", - g_variant_new ("(@a{sv})", - arg_params), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_verify_user_finish: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_verify_user(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_verify_user(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_verify_user_finish ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg1, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_verify_user_sync: - * @proxy: A #SsoIdentityProxy. - * @arg_params: Argument to pass with the method invocation. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the verifyUser() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_verify_user() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_verify_user_sync ( - SsoIdentity *proxy, - GVariant *arg_params, - gboolean *out_unnamed_arg1, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "verifyUser", - g_variant_new ("(@a{sv})", - arg_params), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_verify_secret: - * @proxy: A #SsoIdentityProxy. - * @arg_secret: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the verifySecret() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_verify_secret_finish() to get the result of the operation. - * - * See sso_identity_call_verify_secret_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_verify_secret ( - SsoIdentity *proxy, - const gchar *arg_secret, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "verifySecret", - g_variant_new ("(s)", - arg_secret), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_verify_secret_finish: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_verify_secret(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_verify_secret(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_verify_secret_finish ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg1, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_verify_secret_sync: - * @proxy: A #SsoIdentityProxy. - * @arg_secret: Argument to pass with the method invocation. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the verifySecret() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_verify_secret() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_verify_secret_sync ( - SsoIdentity *proxy, - const gchar *arg_secret, - gboolean *out_unnamed_arg1, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "verifySecret", - g_variant_new ("(s)", - arg_secret), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_remove: - * @proxy: A #SsoIdentityProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the remove() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_remove_finish() to get the result of the operation. - * - * See sso_identity_call_remove_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_remove ( - SsoIdentity *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "remove", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_remove_finish: - * @proxy: A #SsoIdentityProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_remove(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_remove(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_remove_finish ( - SsoIdentity *proxy, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "()"); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_remove_sync: - * @proxy: A #SsoIdentityProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the remove() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_remove() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_remove_sync ( - SsoIdentity *proxy, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "remove", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "()"); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_sign_out: - * @proxy: A #SsoIdentityProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the signOut() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_sign_out_finish() to get the result of the operation. - * - * See sso_identity_call_sign_out_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_sign_out ( - SsoIdentity *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "signOut", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_sign_out_finish: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_sign_out(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_sign_out(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_sign_out_finish ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg0, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_sign_out_sync: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg0: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the signOut() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_sign_out() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_sign_out_sync ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg0, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "signOut", - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(b)", - out_unnamed_arg0); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_store: - * @proxy: A #SsoIdentityProxy. - * @arg_unnamed_arg0: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the store() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_store_finish() to get the result of the operation. - * - * See sso_identity_call_store_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_store ( - SsoIdentity *proxy, - GVariant *arg_unnamed_arg0, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "store", - g_variant_new ("(@a{sv})", - arg_unnamed_arg0), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_store_finish: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_store(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_store(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_store_finish ( - SsoIdentity *proxy, - guint *out_unnamed_arg1, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(u)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_store_sync: - * @proxy: A #SsoIdentityProxy. - * @arg_unnamed_arg0: Argument to pass with the method invocation. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the store() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_store() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_store_sync ( - SsoIdentity *proxy, - GVariant *arg_unnamed_arg0, - guint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "store", - g_variant_new ("(@a{sv})", - arg_unnamed_arg0), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(u)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_add_reference: - * @proxy: A #SsoIdentityProxy. - * @arg_reference: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the addReference() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_add_reference_finish() to get the result of the operation. - * - * See sso_identity_call_add_reference_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_add_reference ( - SsoIdentity *proxy, - const gchar *arg_reference, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "addReference", - g_variant_new ("(s)", - arg_reference), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_add_reference_finish: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_add_reference(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_add_reference(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_add_reference_finish ( - SsoIdentity *proxy, - gint *out_unnamed_arg1, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_add_reference_sync: - * @proxy: A #SsoIdentityProxy. - * @arg_reference: Argument to pass with the method invocation. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the addReference() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_add_reference() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_add_reference_sync ( - SsoIdentity *proxy, - const gchar *arg_reference, - gint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "addReference", - g_variant_new ("(s)", - arg_reference), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_remove_reference: - * @proxy: A #SsoIdentityProxy. - * @arg_reference: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the removeReference() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_call_remove_reference_finish() to get the result of the operation. - * - * See sso_identity_call_remove_reference_sync() for the synchronous, blocking version of this method. - */ -void -sso_identity_call_remove_reference ( - SsoIdentity *proxy, - const gchar *arg_reference, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_dbus_proxy_call (G_DBUS_PROXY (proxy), - "removeReference", - g_variant_new ("(s)", - arg_reference), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - callback, - user_data); -} - -/** - * sso_identity_call_remove_reference_finish: - * @proxy: A #SsoIdentityProxy. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_call_remove_reference(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with sso_identity_call_remove_reference(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_remove_reference_finish ( - SsoIdentity *proxy, - gint *out_unnamed_arg1, - GAsyncResult *res, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_call_remove_reference_sync: - * @proxy: A #SsoIdentityProxy. - * @arg_reference: Argument to pass with the method invocation. - * @out_unnamed_arg1: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the removeReference() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See sso_identity_call_remove_reference() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ -gboolean -sso_identity_call_remove_reference_sync ( - SsoIdentity *proxy, - const gchar *arg_reference, - gint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error) -{ - GVariant *_ret; - _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy), - "removeReference", - g_variant_new ("(s)", - arg_reference), - G_DBUS_CALL_FLAGS_NONE, - -1, - cancellable, - error); - if (_ret == NULL) - goto _out; - g_variant_get (_ret, - "(i)", - out_unnamed_arg1); - g_variant_unref (_ret); -_out: - return _ret != NULL; -} - -/** - * sso_identity_complete_request_credentials_update: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg1: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the requestCredentialsUpdate() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_request_credentials_update ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - guint unnamed_arg1) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(u)", - unnamed_arg1)); -} - -/** - * sso_identity_complete_get_info: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @identityInfo: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the getInfo() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_get_info ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - GVariant *identityInfo) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(@a{sv})", - identityInfo)); -} - -/** - * sso_identity_complete_get_auth_session: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @objectPath: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the getAuthSession() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_get_auth_session ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - const gchar *objectPath) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(o)", - objectPath)); -} - -/** - * sso_identity_complete_verify_user: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg1: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the verifyUser() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_verify_user ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg1) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(b)", - unnamed_arg1)); -} - -/** - * sso_identity_complete_verify_secret: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg1: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the verifySecret() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_verify_secret ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg1) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(b)", - unnamed_arg1)); -} - -/** - * sso_identity_complete_remove: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the remove() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_remove ( - SsoIdentity *object, - GDBusMethodInvocation *invocation) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("()")); -} - -/** - * sso_identity_complete_sign_out: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg0: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the signOut() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_sign_out ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg0) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(b)", - unnamed_arg0)); -} - -/** - * sso_identity_complete_store: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg1: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the store() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_store ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - guint unnamed_arg1) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(u)", - unnamed_arg1)); -} - -/** - * sso_identity_complete_add_reference: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg1: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the addReference() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_add_reference ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gint unnamed_arg1) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(i)", - unnamed_arg1)); -} - -/** - * sso_identity_complete_remove_reference: - * @object: A #SsoIdentity. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unnamed_arg1: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the removeReference() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ -void -sso_identity_complete_remove_reference ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gint unnamed_arg1) -{ - g_dbus_method_invocation_return_value (invocation, - g_variant_new ("(i)", - unnamed_arg1)); -} - -/* ------------------------------------------------------------------------ */ - -/** - * SsoIdentityProxy: - * - * The #SsoIdentityProxy structure contains only private data and should only be accessed using the provided API. - */ - -/** - * SsoIdentityProxyClass: - * @parent_class: The parent class. - * - * Class structure for #SsoIdentityProxy. - */ - -struct _SsoIdentityProxyPrivate -{ - GData *qdata; -}; - -static void sso_identity_proxy_iface_init (SsoIdentityIface *iface); - -G_DEFINE_TYPE_WITH_CODE (SsoIdentityProxy, sso_identity_proxy, G_TYPE_DBUS_PROXY, - G_IMPLEMENT_INTERFACE (TYPE_SSO_IDENTITY, sso_identity_proxy_iface_init)); - -static void -sso_identity_proxy_finalize (GObject *object) -{ - SsoIdentityProxy *proxy = SSO_IDENTITY_PROXY (object); - g_datalist_clear (&proxy->priv->qdata); - G_OBJECT_CLASS (sso_identity_proxy_parent_class)->finalize (object); -} - -static void -sso_identity_proxy_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ -} - -static void -sso_identity_proxy_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ -} - -static void -sso_identity_proxy_g_signal (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, - GVariant *parameters) -{ - _ExtendedGDBusSignalInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - guint num_params; - guint n; - guint signal_id; - info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_sso_identity_interface_info, signal_name); - if (info == NULL) - return; - num_params = g_variant_n_children (parameters); - paramv = g_new0 (GValue, num_params + 1); - g_value_init (¶mv[0], TYPE_SSO_IDENTITY); - g_value_set_object (¶mv[0], proxy); - g_variant_iter_init (&iter, parameters); - n = 1; - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_SSO_IDENTITY); - g_signal_emitv (paramv, signal_id, 0, NULL); - for (n = 0; n < num_params + 1; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static void -sso_identity_proxy_g_properties_changed (GDBusProxy *_proxy, - GVariant *changed_properties, - const gchar *const *invalidated_properties) -{ - SsoIdentityProxy *proxy = SSO_IDENTITY_PROXY (_proxy); - guint n; - const gchar *key; - GVariantIter *iter; - _ExtendedGDBusPropertyInfo *info; - g_variant_get (changed_properties, "a{sv}", &iter); - while (g_variant_iter_next (iter, "{&sv}", &key, NULL)) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_identity_interface_info, key); - g_datalist_remove_data (&proxy->priv->qdata, key); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } - g_variant_iter_free (iter); - for (n = 0; invalidated_properties[n] != NULL; n++) - { - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_identity_interface_info, invalidated_properties[n]); - g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]); - if (info != NULL) - g_object_notify (G_OBJECT (proxy), info->hyphen_name); - } -} - -static void -sso_identity_proxy_init (SsoIdentityProxy *proxy) -{ - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, TYPE_SSO_IDENTITY_PROXY, SsoIdentityProxyPrivate); - g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), sso_identity_interface_info ()); -} - -static void -sso_identity_proxy_class_init (SsoIdentityProxyClass *klass) -{ - GObjectClass *gobject_class; - GDBusProxyClass *proxy_class; - - g_type_class_add_private (klass, sizeof (SsoIdentityProxyPrivate)); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = sso_identity_proxy_finalize; - gobject_class->get_property = sso_identity_proxy_get_property; - gobject_class->set_property = sso_identity_proxy_set_property; - - proxy_class = G_DBUS_PROXY_CLASS (klass); - proxy_class->g_signal = sso_identity_proxy_g_signal; - proxy_class->g_properties_changed = sso_identity_proxy_g_properties_changed; - -} - -static void -sso_identity_proxy_iface_init (SsoIdentityIface *iface) -{ -} - -/** - * sso_identity_proxy_new: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Asynchronously creates a proxy for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.Identity. See g_dbus_proxy_new() for more details. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_proxy_new_finish() to get the result of the operation. - * - * See sso_identity_proxy_new_sync() for the synchronous, blocking version of this constructor. - */ -void -sso_identity_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_SSO_IDENTITY_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.Identity", NULL); -} - -/** - * sso_identity_proxy_new_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_proxy_new(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with sso_identity_proxy_new(). - * - * Returns: (transfer full) (type SsoIdentityProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoIdentity * -sso_identity_proxy_new_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return SSO_IDENTITY (ret); - else - return NULL; -} - -/** - * sso_identity_proxy_new_sync: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Synchronously creates a proxy for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.Identity. See g_dbus_proxy_new_sync() for more details. - * - * The calling thread is blocked until a reply is received. - * - * See sso_identity_proxy_new() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type SsoIdentityProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoIdentity * -sso_identity_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_SSO_IDENTITY_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.Identity", NULL); - if (ret != NULL) - return SSO_IDENTITY (ret); - else - return NULL; -} - - -/** - * sso_identity_proxy_new_for_bus: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Like sso_identity_proxy_new() but takes a #GBusType instead of a #GDBusConnection. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call sso_identity_proxy_new_for_bus_finish() to get the result of the operation. - * - * See sso_identity_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. - */ -void -sso_identity_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data) -{ - g_async_initable_new_async (TYPE_SSO_IDENTITY_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.Identity", NULL); -} - -/** - * sso_identity_proxy_new_for_bus_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to sso_identity_proxy_new_for_bus(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with sso_identity_proxy_new_for_bus(). - * - * Returns: (transfer full) (type SsoIdentityProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoIdentity * -sso_identity_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error) -{ - GObject *ret; - GObject *source_object; - source_object = g_async_result_get_source_object (res); - ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error); - g_object_unref (source_object); - if (ret != NULL) - return SSO_IDENTITY (ret); - else - return NULL; -} - -/** - * sso_identity_proxy_new_for_bus_sync: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Like sso_identity_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. - * - * The calling thread is blocked until a reply is received. - * - * See sso_identity_proxy_new_for_bus() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type SsoIdentityProxy): The constructed proxy object or %NULL if @error is set. - */ -SsoIdentity * -sso_identity_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error) -{ - GInitable *ret; - ret = g_initable_new (TYPE_SSO_IDENTITY_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "com.google.code.AccountsSSO.gSingleSignOn.Identity", NULL); - if (ret != NULL) - return SSO_IDENTITY (ret); - else - return NULL; -} - - -/* ------------------------------------------------------------------------ */ - -/** - * SsoIdentitySkeleton: - * - * The #SsoIdentitySkeleton structure contains only private data and should only be accessed using the provided API. - */ - -/** - * SsoIdentitySkeletonClass: - * @parent_class: The parent class. - * - * Class structure for #SsoIdentitySkeleton. - */ - -struct _SsoIdentitySkeletonPrivate -{ - GValue *properties; - GList *changed_properties; - GSource *changed_properties_idle_source; - GMainContext *context; - GMutex lock; -}; - -static void -_sso_identity_skeleton_handle_method_call ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *method_name, - GVariant *parameters, - GDBusMethodInvocation *invocation, - gpointer user_data) -{ - SsoIdentitySkeleton *skeleton = SSO_IDENTITY_SKELETON (user_data); - _ExtendedGDBusMethodInfo *info; - GVariantIter iter; - GVariant *child; - GValue *paramv; - guint num_params; - guint num_extra; - guint n; - guint signal_id; - GValue return_value = G_VALUE_INIT; - info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation); - g_assert (info != NULL); - num_params = g_variant_n_children (parameters); - num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra); - n = 0; - g_value_init (¶mv[n], TYPE_SSO_IDENTITY); - g_value_set_object (¶mv[n++], skeleton); - g_value_init (¶mv[n], G_TYPE_DBUS_METHOD_INVOCATION); - g_value_set_object (¶mv[n++], invocation); - if (info->pass_fdlist) - { -#ifdef G_OS_UNIX - g_value_init (¶mv[n], G_TYPE_UNIX_FD_LIST); - g_value_set_object (¶mv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))); -#else - g_assert_not_reached (); -#endif - } - g_variant_iter_init (&iter, parameters); - while ((child = g_variant_iter_next_value (&iter)) != NULL) - { - _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra]; - if (arg_info->use_gvariant) - { - g_value_init (¶mv[n], G_TYPE_VARIANT); - g_value_set_variant (¶mv[n], child); - n++; - } - else - g_dbus_gvariant_to_gvalue (child, ¶mv[n++]); - g_variant_unref (child); - } - signal_id = g_signal_lookup (info->signal_name, TYPE_SSO_IDENTITY); - g_value_init (&return_value, G_TYPE_BOOLEAN); - g_signal_emitv (paramv, signal_id, 0, &return_value); - if (!g_value_get_boolean (&return_value)) - g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name); - g_value_unset (&return_value); - for (n = 0; n < num_params + num_extra; n++) - g_value_unset (¶mv[n]); - g_free (paramv); -} - -static GVariant * -_sso_identity_skeleton_handle_get_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GError **error, - gpointer user_data) -{ - SsoIdentitySkeleton *skeleton = SSO_IDENTITY_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - GVariant *ret; - ret = NULL; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_identity_interface_info, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - g_value_init (&value, pspec->value_type); - g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value); - ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature)); - g_value_unset (&value); - } - return ret; -} - -static gboolean -_sso_identity_skeleton_handle_set_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, - const gchar *property_name, - GVariant *variant, - GError **error, - gpointer user_data) -{ - SsoIdentitySkeleton *skeleton = SSO_IDENTITY_SKELETON (user_data); - GValue value = G_VALUE_INIT; - GParamSpec *pspec; - _ExtendedGDBusPropertyInfo *info; - gboolean ret; - ret = FALSE; - info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_sso_identity_interface_info, property_name); - g_assert (info != NULL); - pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name); - if (pspec == NULL) - { - g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name); - } - else - { - if (info->use_gvariant) - g_value_set_variant (&value, variant); - else - g_dbus_gvariant_to_gvalue (variant, &value); - g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value); - g_value_unset (&value); - ret = TRUE; - } - return ret; -} - -static const GDBusInterfaceVTable _sso_identity_skeleton_vtable = -{ - _sso_identity_skeleton_handle_method_call, - _sso_identity_skeleton_handle_get_property, - _sso_identity_skeleton_handle_set_property -}; - -static GDBusInterfaceInfo * -sso_identity_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton) -{ - return sso_identity_interface_info (); -} - -static GDBusInterfaceVTable * -sso_identity_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton) -{ - return (GDBusInterfaceVTable *) &_sso_identity_skeleton_vtable; -} - -static GVariant * -sso_identity_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton) -{ - SsoIdentitySkeleton *skeleton = SSO_IDENTITY_SKELETON (_skeleton); - - GVariantBuilder builder; - guint n; - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}")); - if (_sso_identity_interface_info.parent_struct.properties == NULL) - goto out; - for (n = 0; _sso_identity_interface_info.parent_struct.properties[n] != NULL; n++) - { - GDBusPropertyInfo *info = _sso_identity_interface_info.parent_struct.properties[n]; - if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE) - { - GVariant *value; - value = _sso_identity_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "com.google.code.AccountsSSO.gSingleSignOn.Identity", info->name, NULL, skeleton); - if (value != NULL) - { - g_variant_take_ref (value); - g_variant_builder_add (&builder, "{sv}", info->name, value); - g_variant_unref (value); - } - } - } -out: - return g_variant_builder_end (&builder); -} - -static void -sso_identity_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton) -{ -} - -static void -_sso_identity_on_signal_unregistered ( - SsoIdentity *object) -{ - SsoIdentitySkeleton *skeleton = SSO_IDENTITY_SKELETON (object); - - GList *connections, *l; - GVariant *signal_variant; - connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); - - signal_variant = g_variant_ref_sink (g_variant_new ("()")); - for (l = connections; l != NULL; l = l->next) - { - GDBusConnection *connection = l->data; - g_dbus_connection_emit_signal (connection, - NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "com.google.code.AccountsSSO.gSingleSignOn.Identity", "unregistered", - signal_variant, NULL); - } - g_variant_unref (signal_variant); - g_list_free_full (connections, g_object_unref); -} - -static void -_sso_identity_on_signal_info_updated ( - SsoIdentity *object, - gint arg_unnamed_arg0) -{ - SsoIdentitySkeleton *skeleton = SSO_IDENTITY_SKELETON (object); - - GList *connections, *l; - GVariant *signal_variant; - connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton)); - - signal_variant = g_variant_ref_sink (g_variant_new ("(i)", - arg_unnamed_arg0)); - for (l = connections; l != NULL; l = l->next) - { - GDBusConnection *connection = l->data; - g_dbus_connection_emit_signal (connection, - NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "com.google.code.AccountsSSO.gSingleSignOn.Identity", "infoUpdated", - signal_variant, NULL); - } - g_variant_unref (signal_variant); - g_list_free_full (connections, g_object_unref); -} - -static void sso_identity_skeleton_iface_init (SsoIdentityIface *iface); -G_DEFINE_TYPE_WITH_CODE (SsoIdentitySkeleton, sso_identity_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, - G_IMPLEMENT_INTERFACE (TYPE_SSO_IDENTITY, sso_identity_skeleton_iface_init)); - -static void -sso_identity_skeleton_finalize (GObject *object) -{ - SsoIdentitySkeleton *skeleton = SSO_IDENTITY_SKELETON (object); - g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free); - if (skeleton->priv->changed_properties_idle_source != NULL) - g_source_destroy (skeleton->priv->changed_properties_idle_source); - g_main_context_unref (skeleton->priv->context); - g_mutex_clear (&skeleton->priv->lock); - G_OBJECT_CLASS (sso_identity_skeleton_parent_class)->finalize (object); -} - -static void -sso_identity_skeleton_init (SsoIdentitySkeleton *skeleton) -{ - skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, TYPE_SSO_IDENTITY_SKELETON, SsoIdentitySkeletonPrivate); - g_mutex_init (&skeleton->priv->lock); - skeleton->priv->context = g_main_context_ref_thread_default (); -} - -static void -sso_identity_skeleton_class_init (SsoIdentitySkeletonClass *klass) -{ - GObjectClass *gobject_class; - GDBusInterfaceSkeletonClass *skeleton_class; - - g_type_class_add_private (klass, sizeof (SsoIdentitySkeletonPrivate)); - - gobject_class = G_OBJECT_CLASS (klass); - gobject_class->finalize = sso_identity_skeleton_finalize; - - skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass); - skeleton_class->get_info = sso_identity_skeleton_dbus_interface_get_info; - skeleton_class->get_properties = sso_identity_skeleton_dbus_interface_get_properties; - skeleton_class->flush = sso_identity_skeleton_dbus_interface_flush; - skeleton_class->get_vtable = sso_identity_skeleton_dbus_interface_get_vtable; -} - -static void -sso_identity_skeleton_iface_init (SsoIdentityIface *iface) -{ - iface->unregistered = _sso_identity_on_signal_unregistered; - iface->info_updated = _sso_identity_on_signal_info_updated; -} - -/** - * sso_identity_skeleton_new: - * - * Creates a skeleton object for the D-Bus interface com.google.code.AccountsSSO.gSingleSignOn.Identity. - * - * Returns: (transfer full) (type SsoIdentitySkeleton): The skeleton object. - */ -SsoIdentity * -sso_identity_skeleton_new (void) -{ - return SSO_IDENTITY (g_object_new (TYPE_SSO_IDENTITY_SKELETON, NULL)); -} - diff --git a/libgsignon-glib/sso-identity-gen.h b/libgsignon-glib/sso-identity-gen.h deleted file mode 100644 index 7aa87ee..0000000 --- a/libgsignon-glib/sso-identity-gen.h +++ /dev/null @@ -1,449 +0,0 @@ -/* - * Generated by gdbus-codegen 2.32.4. DO NOT EDIT. - * - * The license of this code is the same as for the source it was derived from. - */ - -#ifndef __SSO_IDENTITY_GEN_H__ -#define __SSO_IDENTITY_GEN_H__ - -#include - -G_BEGIN_DECLS - - -/* ------------------------------------------------------------------------ */ -/* Declarations for com.google.code.AccountsSSO.gSingleSignOn.Identity */ - -#define TYPE_SSO_IDENTITY (sso_identity_get_type ()) -#define SSO_IDENTITY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_IDENTITY, SsoIdentity)) -#define IS_SSO_IDENTITY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_IDENTITY)) -#define SSO_IDENTITY_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), TYPE_SSO_IDENTITY, SsoIdentityIface)) - -struct _SsoIdentity; -typedef struct _SsoIdentity SsoIdentity; -typedef struct _SsoIdentityIface SsoIdentityIface; - -struct _SsoIdentityIface -{ - GTypeInterface parent_iface; - - - gboolean (*handle_add_reference) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - const gchar *arg_reference); - - gboolean (*handle_get_auth_session) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - const gchar *arg_method); - - gboolean (*handle_get_info) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_remove) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_remove_reference) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - const gchar *arg_reference); - - gboolean (*handle_request_credentials_update) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - const gchar *arg_message); - - gboolean (*handle_sign_out) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation); - - gboolean (*handle_store) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - GVariant *arg_unnamed_arg0); - - gboolean (*handle_verify_secret) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - const gchar *arg_secret); - - gboolean (*handle_verify_user) ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - GVariant *arg_params); - - void (*info_updated) ( - SsoIdentity *object, - gint arg_unnamed_arg0); - - void (*unregistered) ( - SsoIdentity *object); - -}; - -GType sso_identity_get_type (void) G_GNUC_CONST; - -GDBusInterfaceInfo *sso_identity_interface_info (void); -guint sso_identity_override_properties (GObjectClass *klass, guint property_id_begin); - - -/* D-Bus method call completion functions: */ -void sso_identity_complete_request_credentials_update ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - guint unnamed_arg1); - -void sso_identity_complete_get_info ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - GVariant *identityInfo); - -void sso_identity_complete_get_auth_session ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - const gchar *objectPath); - -void sso_identity_complete_verify_user ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg1); - -void sso_identity_complete_verify_secret ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg1); - -void sso_identity_complete_remove ( - SsoIdentity *object, - GDBusMethodInvocation *invocation); - -void sso_identity_complete_sign_out ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gboolean unnamed_arg0); - -void sso_identity_complete_store ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - guint unnamed_arg1); - -void sso_identity_complete_add_reference ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gint unnamed_arg1); - -void sso_identity_complete_remove_reference ( - SsoIdentity *object, - GDBusMethodInvocation *invocation, - gint unnamed_arg1); - - - -/* D-Bus signal emissions functions: */ -void sso_identity_emit_unregistered ( - SsoIdentity *object); - -void sso_identity_emit_info_updated ( - SsoIdentity *object, - gint arg_unnamed_arg0); - - - -/* D-Bus method calls: */ -void sso_identity_call_request_credentials_update ( - SsoIdentity *proxy, - const gchar *arg_message, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_request_credentials_update_finish ( - SsoIdentity *proxy, - guint *out_unnamed_arg1, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_request_credentials_update_sync ( - SsoIdentity *proxy, - const gchar *arg_message, - guint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_get_info ( - SsoIdentity *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_get_info_finish ( - SsoIdentity *proxy, - GVariant **out_identityInfo, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_get_info_sync ( - SsoIdentity *proxy, - GVariant **out_identityInfo, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_get_auth_session ( - SsoIdentity *proxy, - const gchar *arg_method, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_get_auth_session_finish ( - SsoIdentity *proxy, - gchar **out_objectPath, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_get_auth_session_sync ( - SsoIdentity *proxy, - const gchar *arg_method, - gchar **out_objectPath, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_verify_user ( - SsoIdentity *proxy, - GVariant *arg_params, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_verify_user_finish ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg1, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_verify_user_sync ( - SsoIdentity *proxy, - GVariant *arg_params, - gboolean *out_unnamed_arg1, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_verify_secret ( - SsoIdentity *proxy, - const gchar *arg_secret, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_verify_secret_finish ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg1, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_verify_secret_sync ( - SsoIdentity *proxy, - const gchar *arg_secret, - gboolean *out_unnamed_arg1, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_remove ( - SsoIdentity *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_remove_finish ( - SsoIdentity *proxy, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_remove_sync ( - SsoIdentity *proxy, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_sign_out ( - SsoIdentity *proxy, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_sign_out_finish ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg0, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_sign_out_sync ( - SsoIdentity *proxy, - gboolean *out_unnamed_arg0, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_store ( - SsoIdentity *proxy, - GVariant *arg_unnamed_arg0, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_store_finish ( - SsoIdentity *proxy, - guint *out_unnamed_arg1, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_store_sync ( - SsoIdentity *proxy, - GVariant *arg_unnamed_arg0, - guint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_add_reference ( - SsoIdentity *proxy, - const gchar *arg_reference, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_add_reference_finish ( - SsoIdentity *proxy, - gint *out_unnamed_arg1, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_add_reference_sync ( - SsoIdentity *proxy, - const gchar *arg_reference, - gint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error); - -void sso_identity_call_remove_reference ( - SsoIdentity *proxy, - const gchar *arg_reference, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); - -gboolean sso_identity_call_remove_reference_finish ( - SsoIdentity *proxy, - gint *out_unnamed_arg1, - GAsyncResult *res, - GError **error); - -gboolean sso_identity_call_remove_reference_sync ( - SsoIdentity *proxy, - const gchar *arg_reference, - gint *out_unnamed_arg1, - GCancellable *cancellable, - GError **error); - - - -/* ---- */ - -#define TYPE_SSO_IDENTITY_PROXY (sso_identity_proxy_get_type ()) -#define SSO_IDENTITY_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_IDENTITY_PROXY, SsoIdentityProxy)) -#define SSO_IDENTITY_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_SSO_IDENTITY_PROXY, SsoIdentityProxyClass)) -#define SSO_IDENTITY_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_SSO_IDENTITY_PROXY, SsoIdentityProxyClass)) -#define IS_SSO_IDENTITY_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_IDENTITY_PROXY)) -#define IS_SSO_IDENTITY_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_SSO_IDENTITY_PROXY)) - -typedef struct _SsoIdentityProxy SsoIdentityProxy; -typedef struct _SsoIdentityProxyClass SsoIdentityProxyClass; -typedef struct _SsoIdentityProxyPrivate SsoIdentityProxyPrivate; - -struct _SsoIdentityProxy -{ - /*< private >*/ - GDBusProxy parent_instance; - SsoIdentityProxyPrivate *priv; -}; - -struct _SsoIdentityProxyClass -{ - GDBusProxyClass parent_class; -}; - -GType sso_identity_proxy_get_type (void) G_GNUC_CONST; - -void sso_identity_proxy_new ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -SsoIdentity *sso_identity_proxy_new_finish ( - GAsyncResult *res, - GError **error); -SsoIdentity *sso_identity_proxy_new_sync ( - GDBusConnection *connection, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - -void sso_identity_proxy_new_for_bus ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -SsoIdentity *sso_identity_proxy_new_for_bus_finish ( - GAsyncResult *res, - GError **error); -SsoIdentity *sso_identity_proxy_new_for_bus_sync ( - GBusType bus_type, - GDBusProxyFlags flags, - const gchar *name, - const gchar *object_path, - GCancellable *cancellable, - GError **error); - - -/* ---- */ - -#define TYPE_SSO_IDENTITY_SKELETON (sso_identity_skeleton_get_type ()) -#define SSO_IDENTITY_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_SSO_IDENTITY_SKELETON, SsoIdentitySkeleton)) -#define SSO_IDENTITY_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_SSO_IDENTITY_SKELETON, SsoIdentitySkeletonClass)) -#define SSO_IDENTITY_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_SSO_IDENTITY_SKELETON, SsoIdentitySkeletonClass)) -#define IS_SSO_IDENTITY_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_SSO_IDENTITY_SKELETON)) -#define IS_SSO_IDENTITY_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_SSO_IDENTITY_SKELETON)) - -typedef struct _SsoIdentitySkeleton SsoIdentitySkeleton; -typedef struct _SsoIdentitySkeletonClass SsoIdentitySkeletonClass; -typedef struct _SsoIdentitySkeletonPrivate SsoIdentitySkeletonPrivate; - -struct _SsoIdentitySkeleton -{ - /*< private >*/ - GDBusInterfaceSkeleton parent_instance; - SsoIdentitySkeletonPrivate *priv; -}; - -struct _SsoIdentitySkeletonClass -{ - GDBusInterfaceSkeletonClass parent_class; -}; - -GType sso_identity_skeleton_get_type (void) G_GNUC_CONST; - -SsoIdentity *sso_identity_skeleton_new (void); - - -G_END_DECLS - -#endif /* __SSO_IDENTITY_GEN_H__ */ diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 index 0ada151..3675543 100644 --- a/m4/gtk-doc.m4 +++ b/m4/gtk-doc.m4 @@ -1,6 +1,6 @@ dnl -*- mode: autoconf -*- -# serial 1 +# serial 2 dnl Usage: dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) @@ -10,8 +10,24 @@ AC_DEFUN([GTK_DOC_CHECK], AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) + AC_MSG_CHECKING([for gtk-doc]) + PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) + AC_MSG_RESULT($have_gtk_doc) + + if test "$have_gtk_doc" = "no"; then + AC_MSG_WARN([ + You will not be able to create source packages with 'make dist' + because $gtk_doc_requires is not found.]) + fi + dnl check for tools we added during development - AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check]) + dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that + dnl may not be writable by the user. Currently, automake requires that the + dnl test name must end in '.test'. + dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 + AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) + AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) @@ -28,22 +44,22 @@ AC_DEFUN([GTK_DOC_CHECK], [use gtk-doc to build documentation [[default=no]]]),, [enable_gtk_doc=no]) - if test x$enable_gtk_doc = xyes; then - ifelse([$1],[], - [PKG_CHECK_EXISTS([gtk-doc],, - AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], - [PKG_CHECK_EXISTS([gtk-doc >= $1],, - AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))]) - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) - fi - fi - AC_MSG_CHECKING([whether to build gtk-doc documentation]) AC_MSG_RESULT($enable_gtk_doc) + if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then + AC_MSG_ERROR([ + You must have $gtk_doc_requires installed to build documentation for + $PACKAGE_NAME. Please install gtk-doc or disable building the + documentation by adding '--disable-gtk-doc' to '[$]0'.]) + fi + + dnl don't check for glib if we build glib + if test "x$PACKAGE_NAME" != "xglib"; then + dnl don't fail if someone does not have glib + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) + fi + dnl enable/disable output formats AC_ARG_ENABLE([gtk-doc-html], AS_HELP_STRING([--enable-gtk-doc-html], @@ -58,7 +74,12 @@ AC_DEFUN([GTK_DOC_CHECK], enable_gtk_doc_pdf=no fi + if test -z "$AM_DEFAULT_VERBOSITY"; then + AM_DEFAULT_VERBOSITY=1 + fi + AC_SUBST([AM_DEFAULT_VERBOSITY]) + AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 828104c..d7c043f 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1312,7 +1312,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1324,9 +1324,19 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac + ;; + powerpc64le-*) + LD="${LD-ld} -m elf32lppclinux" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpc64-*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1355,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -1688,7 +1701,8 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else @@ -2512,17 +2526,6 @@ freebsd* | dragonfly*) esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no @@ -2639,7 +2642,7 @@ linux*oldld* | linux*aout* | linux*coff*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no @@ -3255,10 +3258,6 @@ freebsd* | dragonfly*) fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3297,7 +3296,7 @@ irix5* | irix6* | nonstopux*) ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -4049,7 +4048,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4348,7 +4347,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in # old Intel for x86_64 which still supported -KPIC. ecc*) @@ -6241,9 +6240,6 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes @@ -6405,7 +6401,7 @@ if test "$_lt_caught_CXX_error" != yes; then _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler diff --git a/pygobject/Makefile.in b/pygobject/Makefile.in index 752c087..4eef744 100644 --- a/pygobject/Makefile.in +++ b/pygobject/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,8 +78,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = pygobject -DIST_COMMON = $(overrides_PYTHON) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(overrides_PYTHON) $(top_srcdir)/build-aux/py-compile ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ @@ -48,14 +92,25 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -85,7 +140,10 @@ am__uninstall_files_from_dir = { \ } am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__installdirs = "$(DESTDIR)$(overridesdir)" +am__pep3147_tweak = \ + sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.py|' py_compile = $(top_srcdir)/build-aux/py-compile +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -118,6 +176,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -279,8 +338,11 @@ clean-libtool: -rm -rf .libs _libs install-overridesPYTHON: $(overrides_PYTHON) @$(NORMAL_INSTALL) - test -z "$(overridesdir)" || $(MKDIR_P) "$(DESTDIR)$(overridesdir)" @list='$(overrides_PYTHON)'; dlist=; list2=; test -n "$(overridesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(overridesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(overridesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \ if test -f $$b$$p; then \ @@ -302,21 +364,31 @@ install-overridesPYTHON: $(overrides_PYTHON) uninstall-overridesPYTHON: @$(NORMAL_UNINSTALL) @list='$(overrides_PYTHON)'; test -n "$(overridesdir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ + py_files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$py_files" || exit 0; \ dir='$(DESTDIR)$(overridesdir)'; \ - filesc=`echo "$$files" | sed 's|$$|c|'`; \ - fileso=`echo "$$files" | sed 's|$$|o|'`; \ + pyc_files=`echo "$$py_files" | sed 's|$$|c|'`; \ + pyo_files=`echo "$$py_files" | sed 's|$$|o|'`; \ + py_files_pep3147=`echo "$$py_files" | $(am__pep3147_tweak)`; \ + echo "$$py_files_pep3147";\ + pyc_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|c|'`; \ + pyo_files_pep3147=`echo "$$py_files_pep3147" | sed 's|$$|o|'`; \ st=0; \ - for files in "$$files" "$$filesc" "$$fileso"; do \ + for files in \ + "$$py_files" \ + "$$pyc_files" \ + "$$pyo_files" \ + "$$pyc_files_pep3147" \ + "$$pyo_files_pep3147" \ + ; do \ $(am__uninstall_files_from_dir) || st=$$?; \ done; \ exit $$st -tags: TAGS -TAGS: +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) @@ -455,16 +527,17 @@ uninstall-am: uninstall-overridesPYTHON .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ install-overridesPYTHON install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am uninstall uninstall-am uninstall-overridesPYTHON + ps ps-am tags-am uninstall uninstall-am \ + uninstall-overridesPYTHON # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/Makefile.in b/tests/Makefile.in index afffc68..4ae60bb 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.3 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1994-2013 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. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,8 +80,10 @@ host_triplet = @host@ @HAVE_GTESTDBUS_FALSE@TESTS = signon-glib-test.sh @HAVE_GTESTDBUS_TRUE@TESTS = signon-glib-testsuite$(EXEEXT) check_PROGRAMS = signon-glib-testsuite$(EXEEXT) -DIST_COMMON = $(dist_check_SCRIPTS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/tests/valgrind_common.mk +DIST_COMMON = $(top_srcdir)/tests/valgrind_common.mk \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(dist_check_SCRIPTS) $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver subdir = tests ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ @@ -61,6 +107,19 @@ signon_glib_testsuite_DEPENDENCIES = $(am__DEPENDENCIES_1) \ AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -73,26 +132,246 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_@AM_V@) am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) -am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_@AM_V@) -am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) -am__v_at_0 = @ +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) -am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_@AM_V@) -am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) -am__v_GEN_0 = @echo " GEN " $@; +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(signon_glib_testsuite_SOURCES) DIST_SOURCES = $(signon_glib_testsuite_SOURCES) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red=''; \ + grn=''; \ + lgn=''; \ + blu=''; \ + mgn=''; \ + brg=''; \ + std=''; \ + fi; \ +} +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__recheck_rx = ^[ ]*:recheck:[ ]* +am__global_test_result_rx = ^[ ]*:global-test-result:[ ]* +am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]* +# A command that, given a newline-separated list of test names on the +# standard input, print the name of the tests that are to be re-run +# upon "make recheck". +am__list_recheck_tests = $(AWK) '{ \ + recheck = 1; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + { \ + if ((getline line2 < ($$0 ".log")) < 0) \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \ + { \ + recheck = 0; \ + break; \ + } \ + else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \ + { \ + break; \ + } \ + }; \ + if (recheck) \ + print $$0; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# A command that, given a newline-separated list of test names on the +# standard input, create the global log from their .trs and .log files. +am__create_global_log = $(AWK) ' \ +function fatal(msg) \ +{ \ + print "fatal: making $@: " msg | "cat >&2"; \ + exit 1; \ +} \ +function rst_section(header) \ +{ \ + print header; \ + len = length(header); \ + for (i = 1; i <= len; i = i + 1) \ + printf "="; \ + printf "\n\n"; \ +} \ +{ \ + copy_in_global_log = 1; \ + global_test_result = "RUN"; \ + while ((rc = (getline line < ($$0 ".trs"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".trs"); \ + if (line ~ /$(am__global_test_result_rx)/) \ + { \ + sub("$(am__global_test_result_rx)", "", line); \ + sub("[ ]*$$", "", line); \ + global_test_result = line; \ + } \ + else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \ + copy_in_global_log = 0; \ + }; \ + if (copy_in_global_log) \ + { \ + rst_section(global_test_result ": " $$0); \ + while ((rc = (getline line < ($$0 ".log"))) != 0) \ + { \ + if (rc < 0) \ + fatal("failed to read from " $$0 ".log"); \ + print line; \ + }; \ + printf "\n"; \ + }; \ + close ($$0 ".trs"); \ + close ($$0 ".log"); \ +}' +# Restructured Text title. +am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; } +# Solaris 10 'make', and several other traditional 'make' implementations, +# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it +# by disabling -e (using the XSI extension "set +e") if it's set. +am__sh_e_setup = case $$- in *e*) set +e;; esac +# Default flags passed to test drivers. +am__common_driver_flags = \ + --color-tests "$$am__color_tests" \ + --enable-hard-errors "$$am__enable_hard_errors" \ + --expect-failure "$$am__expect_failure" +# To be inserted before the command running the test. Creates the +# directory for the log if needed. Stores in $dir the directory +# containing $f, in $tst the test, in $log the log. Executes the +# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and +# passes TESTS_ENVIRONMENT. Set up options for the wrapper that +# will run the test scripts (or their associated LOG_COMPILER, if +# thy have one). +am__check_pre = \ +$(am__sh_e_setup); \ +$(am__vpath_adj_setup) $(am__vpath_adj) \ +$(am__tty_colors); \ +srcdir=$(srcdir); export srcdir; \ +case "$@" in \ + */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \ + *) am__odir=.;; \ +esac; \ +test "x$$am__odir" = x"." || test -d "$$am__odir" \ + || $(MKDIR_P) "$$am__odir" || exit $$?; \ +if test -f "./$$f"; then dir=./; \ +elif test -f "$$f"; then dir=; \ +else dir="$(srcdir)/"; fi; \ +tst=$$dir$$f; log='$@'; \ +if test -n '$(DISABLE_HARD_ERRORS)'; then \ + am__enable_hard_errors=no; \ +else \ + am__enable_hard_errors=yes; \ +fi; \ +case " $(XFAIL_TESTS) " in \ + *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \ + am__expect_failure=yes;; \ + *) \ + am__expect_failure=no;; \ +esac; \ +$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the '.log' extension removed). The result is saved in the shell variable +# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ + bases=`echo $$bases` +RECHECK_LOGS = $(TEST_LOGS) +AM_RECURSIVE_TARGETS = check recheck +TEST_SUITE_LOG = test-suite.log +TEST_EXTENSIONS = @EXEEXT@ .test +LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS) +am__set_b = \ + case '$@' in \ + */*) \ + case '$*' in \ + */*) b='$*';; \ + *) b=`echo '$@' | sed 's/\.log$$//'`; \ + esac;; \ + *) \ + b='$*';; \ + esac +am__test_logs1 = $(TESTS:=.log) +am__test_logs2 = $(am__test_logs1:@EXEEXT@.log=.log) +TEST_LOGS = $(am__test_logs2:.test.log=.log) +TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver +TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ + $(TEST_LOG_FLAGS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -125,6 +404,7 @@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ @@ -262,7 +542,7 @@ signon_glib_testsuite_LDADD = \ all: all-am .SUFFIXES: -.SUFFIXES: .c .lo .o .obj +.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/tests/valgrind_common.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -303,6 +583,7 @@ clean-checkPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list + signon-glib-testsuite$(EXEEXT): $(signon_glib_testsuite_OBJECTS) $(signon_glib_testsuite_DEPENDENCIES) $(EXTRA_signon_glib_testsuite_DEPENDENCIES) @rm -f signon-glib-testsuite$(EXEEXT) $(AM_V_CCLD)$(LINK) $(signon_glib_testsuite_OBJECTS) $(signon_glib_testsuite_LDADD) $(LIBS) @@ -359,26 +640,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -390,15 +660,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -407,102 +673,194 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ +# Recover from deleted '.trs' file; this should ensure that +# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create +# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells +# to avoid problems with "make -n". +.log.trs: + rm -f $< $@ + $(MAKE) $(AM_MAKEFLAGS) $< + +# Leading 'am--fnord' is there to ensure the list of targets does not +# expand to empty, as could happen e.g. with make check TESTS=''. +am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) +am--force-recheck: + @: + +$(TEST_SUITE_LOG): $(TEST_LOGS) + @$(am__set_TESTS_bases); \ + am__f_ok () { test -f "$$1" && test -r "$$1"; }; \ + redo_bases=`for i in $$bases; do \ + am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \ + done`; \ + if test -n "$$redo_bases"; then \ + redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \ + redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \ + if $(am__make_dryrun); then :; else \ + rm -f $$redo_logs && rm -f $$redo_results || exit 1; \ fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ + fi; \ + if test -n "$$am__remaking_logs"; then \ + echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ + "recursion detected" >&2; \ + else \ + am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ + fi; \ + if $(am__make_dryrun); then :; else \ + st=0; \ + errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \ + for i in $$redo_bases; do \ + test -f $$i.trs && test -r $$i.trs \ + || { echo "$$errmsg $$i.trs" >&2; st=1; }; \ + test -f $$i.log && test -r $$i.log \ + || { echo "$$errmsg $$i.log" >&2; st=1; }; \ + done; \ + test $$st -eq 0 || exit 1; \ + fi + @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \ + ws='[ ]'; \ + results=`for b in $$bases; do echo $$b.trs; done`; \ + test -n "$$results" || results=/dev/null; \ + all=` grep "^$$ws*:test-result:" $$results | wc -l`; \ + pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \ + fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \ + skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \ + xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \ + xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \ + error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \ + if test `expr $$fail + $$xpass + $$error` -eq 0; then \ + success=true; \ + else \ + success=false; \ + fi; \ + br='==================='; br=$$br$$br$$br$$br; \ + result_count () \ + { \ + if test x"$$1" = x"--maybe-color"; then \ + maybe_colorize=yes; \ + elif test x"$$1" = x"--no-color"; then \ + maybe_colorize=no; \ else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ + echo "$@: invalid 'result_count' usage" >&2; exit 4; \ fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ + shift; \ + desc=$$1 count=$$2; \ + if test $$maybe_colorize = yes && test $$count -gt 0; then \ + color_start=$$3 color_end=$$std; \ else \ - skipped="($$skip tests were not run)"; \ + color_start= color_end=; \ fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - col="$$grn"; \ - else \ - col="$$red"; \ - fi; \ - echo "$${col}$$dashes$${std}"; \ - echo "$${col}$$banner$${std}"; \ - test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ - test -z "$$report" || echo "$${col}$$report$${std}"; \ - echo "$${col}$$dashes$${std}"; \ - test "$$failed" -eq 0; \ - else :; fi + echo "$${color_start}# $$desc $$count$${color_end}"; \ + }; \ + create_testsuite_report () \ + { \ + result_count $$1 "TOTAL:" $$all "$$brg"; \ + result_count $$1 "PASS: " $$pass "$$grn"; \ + result_count $$1 "SKIP: " $$skip "$$blu"; \ + result_count $$1 "XFAIL:" $$xfail "$$lgn"; \ + result_count $$1 "FAIL: " $$fail "$$red"; \ + result_count $$1 "XPASS:" $$xpass "$$red"; \ + result_count $$1 "ERROR:" $$error "$$mgn"; \ + }; \ + { \ + echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \ + $(am__rst_title); \ + create_testsuite_report --no-color; \ + echo; \ + echo ".. contents:: :depth: 2"; \ + echo; \ + for b in $$bases; do echo $$b; done \ + | $(am__create_global_log); \ + } >$(TEST_SUITE_LOG).tmp || exit 1; \ + mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \ + if $$success; then \ + col="$$grn"; \ + else \ + col="$$red"; \ + test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ + fi; \ + echo "$${col}$$br$${std}"; \ + echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}$$br$${std}"; \ + create_testsuite_report --maybe-color; \ + echo "$$col$$br$$std"; \ + if $$success; then :; else \ + echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \ + if test -n "$(PACKAGE_BUGREPORT)"; then \ + echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \ + fi; \ + echo "$$col$$br$$std"; \ + fi; \ + $$success || exit 1 + +check-TESTS: + @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list + @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + trs_list=`for i in $$bases; do echo $$i.trs; done`; \ + log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ + exit $$?; +recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS) + @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) + @set +e; $(am__set_TESTS_bases); \ + bases=`for i in $$bases; do echo $$i; done \ + | $(am__list_recheck_tests)` || exit 1; \ + log_list=`for i in $$bases; do echo $$i.log; done`; \ + log_list=`echo $$log_list`; \ + $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \ + am__force_recheck=am--force-recheck \ + TEST_LOGS="$$log_list"; \ + exit $$? +signon-glib-test.sh.log: signon-glib-test.sh + @p='signon-glib-test.sh'; \ + b='signon-glib-test.sh'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +signon-glib-testsuite.log: signon-glib-testsuite$(EXEEXT) + @p='signon-glib-testsuite$(EXEEXT)'; \ + b='signon-glib-testsuite'; \ + $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +.test.log: + @p='$<'; \ + $(am__set_b); \ + $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) +@am__EXEEXT_TRUE@.test$(EXEEXT).log: +@am__EXEEXT_TRUE@ @p='$<'; \ +@am__EXEEXT_TRUE@ $(am__set_b); \ +@am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \ +@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ +@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ +@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -561,6 +919,9 @@ install-strip: "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ fi mostlyclean-generic: + -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) + -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) clean-generic: @@ -644,9 +1005,9 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool ctags \ - distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ @@ -656,7 +1017,7 @@ uninstall-am: installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + recheck tags tags-am uninstall uninstall-am %.valgrind: % diff --git a/tests/signon-glib-test.sh b/tests/signon-glib-test.sh index 25abe99..503edd6 100755 --- a/tests/signon-glib-test.sh +++ b/tests/signon-glib-test.sh @@ -22,10 +22,10 @@ if command -v dbus-test-runner > /dev/null ; then -t "$TEST_APP" -f com.google.code.AccountsSSO.gSingleSignOn else echo "Using existing D-Bus session" - pkill gsignond || true - trap "pkill -9 gsignond" EXIT - gsignond & - sleep 2 + #pkill gsignond || true + #trap "pkill -9 gsignond" EXIT + #gsignond & + #sleep 2 $TEST_APP fi diff --git a/tools/prepare-tizen.sh b/tools/prepare-tizen.sh index d9195ea..72db9d9 100755 --- a/tools/prepare-tizen.sh +++ b/tools/prepare-tizen.sh @@ -4,21 +4,16 @@ if [ $# -ne 2 -o -z "$1" -o -z "$2" ]; then echo "Invalid arguments supplied" - echo "Usage: ./prepare-tizen.sh libgsignon-glib-.tar.gz destfolder" + echo "Usage: ./prepare-tizen.sh " echo "NOTE: All the files will be extracted under destfolder (instead of destfolder/libgsignon-glib-)" exit fi -currdir = `pwd`; -echo "CURR dir = $currdir" - mkdir -p $2 && \ cd $2 && \ -git rm -r * && \ +git rm -r *; rm -rf packaging; tar -xzvf $1 -C $2 --strip-components 1 && \ mkdir -p packaging && \ -cd packaging && \ -ln -s ../dists/rpm/libgsignon-glib-tizen.spec libgsignon-glib.spec && \ -ln -s ../dists/rpm/libgsignon-glib-tizen.changes libgsignon-glib.changes && \ -cd .. && git add *; - +cp -f dists/rpm/libgsignon-glib-tizen.spec packaging/libgsignon-glib.spec && \ +cp -f dists/rpm/libgsignon-glib-tizen.changes packaging/libgsignon-glib.changes && \ +git add -f *; -- 2.7.4