EXTRA_DIST = $(desktop_DATA) $(autostart_DATA)
+if ASCIIDOC
README.html: README www/style.css
asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
NEWS.html: NEWS www/style.css
asciidoc --theme style -a themedir=`pwd`/www NEWS
+endif
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \
- AUTHORS COPYING ChangeLog INSTALL NEWS ar-lib compile \
- config.guess config.rpath config.sub depcomp install-sh \
- missing
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in ABOUT-NLS $(dist_doc_DATA) COPYING \
+ ar-lib compile config.guess config.rpath config.sub depcomp \
+ install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
CONFIG_HEADER = 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_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;; \
DATA = $(desktop_DATA) $(dist_doc_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 = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
&& 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,'; \
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$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
$(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
dir='$(DESTDIR)$(docdir)'; $(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; \
$(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 \
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; \
$$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
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)
|| 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
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*) \
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod u+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 \
&& $(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'
uninstall-am: uninstall-desktopDATA uninstall-dist_docDATA
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- ctags-recursive install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-lzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+ dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-generic distclean-hdr \
distclean-tags distcleancheck distdir distuninstallcheck dvi \
dvi-am html html-am info info-am install install-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am \
uninstall-desktopDATA uninstall-dist_docDATA
-README.html: README www/style.css
- asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
+@ASCIIDOC_TRUE@README.html: README www/style.css
+@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/www -n -a toc README
-NEWS.html: NEWS www/style.css
- asciidoc --theme style -a themedir=`pwd`/www NEWS
+@ASCIIDOC_TRUE@NEWS.html: NEWS www/style.css
+@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/www NEWS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Psensor NEWS
============
+v1.1.1
+------
+
+* Sensor properties stored in +$HOME/.psensor/psensor.cfg+ instead of
+ GConf.
+* psensor settings stored with dconf, removed dependency to gconf2.
+* Fixed check of sensors/error.h.
+* Made asciidoc optional.
+* Hide/show sensors in the main window.
+* Added TODO in the source tarball.
+* Merged Hungarian translation from LP (Richard Somlói).
+* Merged Italian translation from LP (Gabriele).
+* Merged Latvian translation from LP (tuxmaniack).
+* Merged Swedish translation from LP (Josef Andersson).
+* Meged Turkish translation from LP (İbrahim Çelik).
+
+v1.0.4
+------
+
+* Fixed menu separators of the appindicator.
+
+v1.0.3
+------
+
+* Fixed bug: psensor not autostarted when $HOME/.config/autostart does
+ not exist.
+* Fixed few swedish translations (Josef Andersson).
+* Fixed psensor does not start: Attempt to unlock mutex that was not
+ locked during startup with glib 2.41.2. (LP: #1346299).
+* Fixed FTBFS with clang instead of gcc. (Closes: #753061).
+* Fixed notification script call (wrong allocation of command string).
+
v1.0.2
------
</div>\r
<div id="content">\r
<div class="sect1">\r
+<h2 id="_v1_1_1">v1.1.1</h2>\r
+<div class="sectionbody">\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+Sensor properties stored in <code>$HOME/.psensor/psensor.cfg</code> instead of\r
+ GConf.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+psensor settings stored with dconf, removed dependency to gconf2.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed check of sensors/error.h.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Made asciidoc optional.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Hide/show sensors in the main window.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Added TODO in the source tarball.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Merged Hungarian translation from LP (Richard Somlói).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Merged Italian translation from LP (Gabriele).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Merged Latvian translation from LP (tuxmaniack).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Merged Swedish translation from LP (Josef Andersson).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Meged Turkish translation from LP (İbrahim Çelik).\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+</div>\r
+<div class="sect1">\r
+<h2 id="_v1_0_4">v1.0.4</h2>\r
+<div class="sectionbody">\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+Fixed menu separators of the appindicator.\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+</div>\r
+<div class="sect1">\r
+<h2 id="_v1_0_3">v1.0.3</h2>\r
+<div class="sectionbody">\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+Fixed bug: psensor not autostarted when $HOME/.config/autostart does\r
+ not exist.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed few swedish translations (Josef Andersson).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed psensor does not start: Attempt to unlock mutex that was not\r
+ locked during startup with glib 2.41.2. (LP: #1346299).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed FTBFS with clang instead of gcc. (Closes: #753061).\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Fixed notification script call (wrong allocation of command string).\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+</div>\r
+<div class="sect1">\r
<h2 id="_v1_0_2">v1.0.2</h2>\r
<div class="sectionbody">\r
<div class="ulist"><ul>\r
<div id="footnotes"><hr /></div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2014-06-03 08:22:21 CEST\r
+Last updated 2014-08-27 10:16:15 CEST\r
</div>\r
</div>\r
</body>\r
* lm-sensors
* library sensors4
* library gtk3 >=3.4
- * library gconf2
* help2man
* asciidoc (optional, required to produce the html version of the
faq)
* library libnotify (optional)
* library libappindicator (optional)
* library libXNVCtrl (optional)
- * library json0 and curl (optional, required for remote monitoring)
+ * library json-c >= 0.11.99 and curl (optional, required for remote monitoring)
* library unity (>=v3.4.2, optional)
* library gtop2 (optional, required for CPU usage)
* library atasmart (optional, for disk monitoring)
* library libmicrohttpd
* library json0
-For Debian 7.0:
------------------------------------------------------------------
-sudo apt-get install asciidoc cppcheck gcc gettext libgtk-3-dev
-libgconf2-dev libnotify-dev libsensors4-dev help2man
-libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev
-libatasmart-dev make
------------------------------------------------------------------
-
-For Fedora 17:
------------------------------------------------------------------------
-sudo yum install gcc gtk3-devel GConf2-devel lm_sensors-devel cppcheck
-libatasmart-devel libcurl-devel json-c-devel libmicrohttpd-devel
-help2man libnotify-devel libgtop2-devel make
------------------------------------------------------------------------
-
-For Ubuntu 12.10:
--------------------------------------------------------------------------
-sudo apt-get install asciidoc autoconf automake autopoint
-debhelper (>= 9) cppcheck gettext help2man libappindicator3-dev
-libatasmart-dev libcurl4-gnutls-dev libgconf2-dev libgtk-3-dev
-libgtop2-dev libjson0-dev libmicrohttpd-dev libnotify-dev
-libsensors4-dev libunity-dev nvidia-settings perl
-
--------------------------------------------------------------------------
-
Compilation and Installation Steps
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 8.6.7" />\r
+<meta name="generator" content="AsciiDoc 8.6.9" />\r
<title>Psensor README</title>\r
<style type="text/css">\r
\r
-webkit-box-shadow: 0 2px 2px 0 #C2C2C2;\r
box-shadow: 0 2px 2px 0 #C2C2C2;\r
}\r
+\r
+\r
</style>\r
<script type="text/javascript">\r
/*<![CDATA[*/\r
<div class="ulist"><ul>\r
<li>\r
<p>\r
-start <tt>psensor-server</tt> on the remote computer.\r
+start <code>psensor-server</code> on the remote computer.\r
</p>\r
</li>\r
<li>\r
<p>\r
-start <tt>psensor</tt> using: <tt>psensor --url=http://hostname:3131</tt>.\r
+start <code>psensor</code> using: <code>psensor --url=http://hostname:3131</code>.\r
</p>\r
</li>\r
</ul></div>\r
-<div class="paragraph"><p><tt>psensor-server</tt> is a minimal Web server, a Web browser can be used to\r
+<div class="paragraph"><p><code>psensor-server</code> is a minimal Web server, a Web browser can be used to\r
monitor the remote computer by opening the URL:\r
-<tt>http://hostname:3131</tt>.</p></div>\r
+<code>http://hostname:3131</code>.</p></div>\r
<div class="admonitionblock">\r
<table><tr>\r
<td class="icon">\r
<div class="title">Warning</div>\r
</td>\r
-<td class="content"><tt>psensor-server</tt> does not provide any way to restrict the connection\r
+<td class="content"><code>psensor-server</code> does not provide any way to restrict the connection\r
to the HTTP server, worst, no effort has been made against malicious\r
-HTTP attacks. You should make the <tt>psensor-server</tt> port available\r
+HTTP attacks. You should make the <code>psensor-server</code> port available\r
only to a network or computer you trust by using the usual network\r
security tools of the system (for example:\r
<a href="http://www.netfilter.org/projects/iptables/index.html">iptables</a>).</td>\r
<div class="paragraph"><p>To do the installation:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>sudo apt-get install psensor psensor-server</tt></pre>\r
+<pre><code>sudo apt-get install psensor psensor-server</code></pre>\r
</div></div>\r
</div>\r
<div class="sect2">\r
<h3 id="_ubuntu">2.2. Ubuntu</h3>\r
<div class="paragraph"><p>Since Ubuntu Oneiric (11.10), psensor is available in the universe\r
repository of Ubuntu.</p></div>\r
-<div class="paragraph"><p>To install <tt>psensor</tt> or <tt>psensor-server</tt>:</p></div>\r
+<div class="paragraph"><p>To install <code>psensor</code> or <code>psensor-server</code>:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>sudo apt-get install psensor\r
-sudo apt-get install psensor-server</tt></pre>\r
+<pre><code>sudo apt-get install psensor\r
+sudo apt-get install psensor-server</code></pre>\r
</div></div>\r
<div class="paragraph"><p>Or search them in the Ubuntu Software Center.</p></div>\r
<div class="paragraph"><p>For other Ubuntu releases or user the more recent release, the easiest\r
<div class="paragraph"><p>Last stable version:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>sudo apt-get apt-add-repository ppa:/jfi/psensor\r
+<pre><code>sudo apt-get apt-add-repository ppa:/jfi/psensor\r
sudo apt-get update\r
sudo apt-get install psensor\r
-sudo apt-get install psensor-server</tt></pre>\r
+sudo apt-get install psensor-server</code></pre>\r
</div></div>\r
<div class="paragraph"><p>Last development version which should not contain major bugs:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>sudo apt-get apt-add-repository ppa:/jfi/psensor-unstable\r
+<pre><code>sudo apt-get apt-add-repository ppa:/jfi/psensor-unstable\r
sudo apt-get update\r
sudo apt-get install psensor\r
-sudo apt-get install psensor-server</tt></pre>\r
+sudo apt-get install psensor-server</code></pre>\r
</div></div>\r
<div class="paragraph"><p>Daily trunk build which may contain major bugs and partialy\r
implemented features:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>sudo apt-get apt-add-repository ppa:/jfi/psensor-daily-trunk\r
+<pre><code>sudo apt-get apt-add-repository ppa:/jfi/psensor-daily-trunk\r
sudo apt-get update\r
sudo apt-get install psensor\r
-sudo apt-get install psensor-server</tt></pre>\r
+sudo apt-get install psensor-server</code></pre>\r
</div></div>\r
</div>\r
</div>\r
<div class="sect1">\r
<h2 id="_installation_from_source_archive">3. Installation From Source Archive</h2>\r
<div class="sectionbody">\r
-<div class="paragraph"><p><tt>psensor</tt> and <tt>psensor-server</tt> can be compiled and installed on any\r
+<div class="paragraph"><p><code>psensor</code> and <code>psensor-server</code> can be compiled and installed on any\r
modern GNU/Linux distribution.</p></div>\r
<div class="sect2">\r
<h3 id="_compilation_prerequisites">3.1. Compilation Prerequisites</h3>\r
-<div class="paragraph"><p>The compilation of <tt>psensor</tt> requires:</p></div>\r
+<div class="paragraph"><p>The compilation of <code>psensor</code> requires:</p></div>\r
<div class="ulist"><ul>\r
<li>\r
<p>\r
</li>\r
<li>\r
<p>\r
-library gconf2\r
-</p>\r
-</li>\r
-<li>\r
-<p>\r
help2man\r
</p>\r
</li>\r
</li>\r
<li>\r
<p>\r
-library json0 and curl (optional, required for remote monitoring)\r
+library json-c >= 0.11.99 and curl (optional, required for remote monitoring)\r
</p>\r
</li>\r
<li>\r
</p>\r
</li>\r
</ul></div>\r
-<div class="paragraph"><p>The specific requirements for <tt>psensor-server</tt>:</p></div>\r
+<div class="paragraph"><p>The specific requirements for <code>psensor-server</code>:</p></div>\r
<div class="ulist"><ul>\r
<li>\r
<p>\r
</p>\r
</li>\r
</ul></div>\r
-<div class="paragraph"><p>For Debian 7.0:</p></div>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>sudo apt-get install asciidoc cppcheck gcc gettext libgtk-3-dev\r
-libgconf2-dev libnotify-dev libsensors4-dev help2man\r
-libcurl4-openssl-dev libjson0-dev libmicrohttpd-dev libgtop2-dev\r
-libatasmart-dev make</tt></pre>\r
-</div></div>\r
-<div class="paragraph"><p>For Fedora 17:</p></div>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>sudo yum install gcc gtk3-devel GConf2-devel lm_sensors-devel cppcheck\r
-libatasmart-devel libcurl-devel json-c-devel libmicrohttpd-devel\r
-help2man libnotify-devel libgtop2-devel make</tt></pre>\r
-</div></div>\r
-<div class="paragraph"><p>For Ubuntu 12.10:</p></div>\r
-<div class="listingblock">\r
-<div class="content">\r
-<pre><tt>sudo apt-get install asciidoc autoconf automake autopoint\r
-debhelper (>= 9) cppcheck gettext help2man libappindicator3-dev\r
-libatasmart-dev libcurl4-gnutls-dev libgconf2-dev libgtk-3-dev\r
-libgtop2-dev libjson0-dev libmicrohttpd-dev libnotify-dev\r
-libsensors4-dev libunity-dev nvidia-settings perl</tt></pre>\r
-</div></div>\r
</div>\r
<div class="sect2">\r
<h3 id="_compilation_and_installation_steps">3.2. Compilation and Installation Steps</h3>\r
</li>\r
<li>\r
<p>\r
-Compilation: <tt>./configure;make clean all</tt>\r
+Compilation: <code>./configure;make clean all</code>\r
</p>\r
</li>\r
<li>\r
<p>\r
-Installation: <tt>make install</tt> (require to have root permission)\r
+Installation: <code>make install</code> (require to have root permission)\r
</p>\r
</li>\r
<li>\r
<p>\r
-Start the sensor detection script: <tt>sensors-detect</tt> and follows the\r
+Start the sensor detection script: <code>sensors-detect</code> and follows the\r
instructions. Reboot or activate the kernel modules which have\r
been found.\r
</p>\r
</li>\r
<li>\r
<p>\r
-To monitor HDDs, the <tt>hddtemp</tt> daemon must be installed and running.\r
+To monitor HDDs, the <code>hddtemp</code> daemon must be installed and running.\r
</p>\r
</li>\r
<li>\r
<p>\r
-Run: <tt>psensor</tt>\r
+Run: <code>psensor</code>\r
</p>\r
</li>\r
</ol></div>\r
<div class="paragraph"><p>Download the\r
<a href="http://developer.amd.com/sdks/ADLSDK/Pages/default.aspx">ATI ADL SDK</a>\r
and extracts the files of the archive into a directory [dir].</p></div>\r
-<div class="paragraph"><p>Replace the step 3. of the above section by <tt>./configure\r
---with-libatiadl=[dir]</tt> where <tt>[dir]</tt> must be the directory where you\r
+<div class="paragraph"><p>Replace the step 3. of the above section by <code>./configure\r
+--with-libatiadl=[dir]</code> where <code>[dir]</code> must be the directory where you\r
have extracted the ATI ADL SDK. Other steps are indentical.</p></div>\r
</div>\r
</div>\r
<div id="footnotes"><hr /></div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2014-04-10 01:57:33 CEST\r
+Last updated 2014-08-23 13:50:12 CEST\r
</div>\r
</div>\r
</body>\r
-# generated automatically by aclocal 1.11.6 -*- 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.
# 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.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'.])])
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl you should install foo.schemas files
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
dnl
-AC_DEFUN([AM_GCONF_SOURCE_2],
+AC_DEFUN([GLIB_GSETTINGS],
[
- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ m4_pattern_allow([AM_V_GEN])
+ AC_ARG_ENABLE(schemas-compile,
+ AS_HELP_STRING([--disable-schemas-compile],
+ [Disable regeneration of gschemas.compiled on install]),
+ [case ${enableval} in
+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+ esac])
+ AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+ PKG_PROG_PKG_CONFIG([0.16])
+ AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+ if test x$cross_compiling != xyes; then
+ GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
-
- AC_ARG_WITH([gconf-source],
- AC_HELP_STRING([--with-gconf-source=sourceaddress],
- [Config database for installing schema files.]),
- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
- fi
-
- AC_ARG_WITH([gconf-schema-file-dir],
- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
- [Directory for installing schema files.]),
- [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
- AC_ARG_ENABLE(schemas-install,
- AC_HELP_STRING([--disable-schemas-install],
- [Disable the schemas installation]),
- [case ${enableval} in
- yes|no) ;;
- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
- esac])
- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-
-# gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl default (if it is not specified or empty) is 'no-libtool'.
-dnl INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl depending on --{enable,disable}-{shared,static} and on the presence of
-dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl implementations (in libc or libintl) without the ngettext() function
-dnl will be ignored. If NEEDSYMBOL is specified and is
-dnl 'need-formatstring-macros', then GNU gettext implementations that don't
-dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries. If empty,
-dnl the value '$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl and used.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl Catalog format: none
-dnl Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
- dnl Argument checking.
- ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
- [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
- ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
- [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
- ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
- [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
- define([gt_included_intl],
- ifelse([$1], [external],
- ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
- [yes]))
- define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
- gt_NEEDS_INIT
- AM_GNU_GETTEXT_NEED([$2])
-
- AC_REQUIRE([AM_PO_SUBDIRS])dnl
- ifelse(gt_included_intl, yes, [
- AC_REQUIRE([AM_INTL_SUBDIR])dnl
- ])
-
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- dnl Ideally we would do this search only after the
- dnl if test "$USE_NLS" = "yes"; then
- dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
- dnl the configure script would need to contain the same shell code
- dnl again, outside any 'if'. There are two solutions:
- dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
- dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
- dnl documented, we avoid it.
- ifelse(gt_included_intl, yes, , [
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
- ])
-
- dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
- gt_INTL_MACOSX
-
- dnl Set USE_NLS.
- AC_REQUIRE([AM_NLS])
-
- ifelse(gt_included_intl, yes, [
- BUILD_INCLUDED_LIBINTL=no
- USE_INCLUDED_LIBINTL=no
- ])
- LIBINTL=
- LTLIBINTL=
- POSUB=
-
- dnl Add a version number to the cache macros.
- case " $gt_needs " in
- *" need-formatstring-macros "*) gt_api_version=3 ;;
- *" need-ngettext "*) gt_api_version=2 ;;
- *) gt_api_version=1 ;;
- esac
- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
- dnl If we use NLS figure out what method
- if test "$USE_NLS" = "yes"; then
- gt_use_preinstalled_gnugettext=no
- ifelse(gt_included_intl, yes, [
- AC_MSG_CHECKING([whether included gettext is requested])
- AC_ARG_WITH([included-gettext],
- [ --with-included-gettext use the GNU gettext library included here],
- nls_cv_force_use_gnu_gettext=$withval,
- nls_cv_force_use_gnu_gettext=no)
- AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
- ])
- dnl User does not insist on using GNU NLS library. Figure out what
- dnl to use. If GNU gettext is available we use this. Else we have
- dnl to fall back to GNU NLS library.
-
- if test $gt_api_version -ge 3; then
- gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
- else
- gt_revision_test_code=
- fi
- if test $gt_api_version -ge 2; then
- gt_expression_test_code=' + * ngettext ("", "", 0)'
- else
- gt_expression_test_code=
- fi
-
- AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
- [AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
- ]],
- [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
- ]])],
- [eval "$gt_func_gnugettext_libc=yes"],
- [eval "$gt_func_gnugettext_libc=no"])])
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- ifelse(gt_included_intl, yes, , [
- AM_ICONV_LINK
- ])
- dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
- dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
- dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
- dnl even if libiconv doesn't exist.
- AC_LIB_LINKFLAGS_BODY([intl])
- AC_CACHE_CHECK([for GNU gettext in libintl],
- [$gt_func_gnugettext_libintl],
- [gt_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCINTL"
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBINTL"
- dnl Now see whether libintl exists and does not depend on libiconv.
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
- ]],
- [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
- ]])],
- [eval "$gt_func_gnugettext_libintl=yes"],
- [eval "$gt_func_gnugettext_libintl=no"])
- dnl Now see whether libintl exists and depends on libiconv.
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
- LIBS="$LIBS $LIBICONV"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
- ]],
- [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
- ]])],
- [LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
- ])
- fi
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"])
- fi
-
- dnl If an already present or preinstalled GNU gettext() is found,
- dnl use it. But if this macro is used in GNU gettext, and GNU
- dnl gettext is already preinstalled in libintl, we update this
- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
- && test "$PACKAGE" != gettext-runtime \
- && test "$PACKAGE" != gettext-tools; }; then
- gt_use_preinstalled_gnugettext=yes
- else
- dnl Reset the values set by searching for libintl.
- LIBINTL=
- LTLIBINTL=
- INCINTL=
- fi
-
- ifelse(gt_included_intl, yes, [
- if test "$gt_use_preinstalled_gnugettext" != "yes"; then
- dnl GNU gettext is not found in the C library.
- dnl Fall back on included GNU gettext library.
- nls_cv_use_gnu_gettext=yes
- fi
- fi
-
- if test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions used to generate GNU NLS library.
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
- fi
-
- CATOBJEXT=
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions to use GNU gettext tools.
- CATOBJEXT=.gmo
- fi
- ])
-
- if test -n "$INTL_MACOSX_LIBS"; then
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Some extra flags are needed during linking.
- LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
- LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
- fi
- fi
-
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- AC_DEFINE([ENABLE_NLS], [1],
- [Define to 1 if translation of program messages to the user's native language
- is requested.])
- else
- USE_NLS=no
- fi
- fi
-
- AC_MSG_CHECKING([whether to use NLS])
- AC_MSG_RESULT([$USE_NLS])
- if test "$USE_NLS" = "yes"; then
- AC_MSG_CHECKING([where the gettext function comes from])
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- gt_source="external libintl"
- else
- gt_source="libc"
- fi
- else
- gt_source="included intl directory"
- fi
- AC_MSG_RESULT([$gt_source])
+ AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
fi
-
- if test "$USE_NLS" = "yes"; then
-
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- AC_MSG_CHECKING([how to link with libintl])
- AC_MSG_RESULT([$LIBINTL])
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
- fi
-
- dnl For backward compatibility. Some packages may be using this.
- AC_DEFINE([HAVE_GETTEXT], [1],
- [Define if the GNU gettext() function is already present or preinstalled.])
- AC_DEFINE([HAVE_DCGETTEXT], [1],
- [Define if the GNU dcgettext() function is already present or preinstalled.])
- fi
-
- dnl We need to process the po/ directory.
- POSUB=po
- fi
-
- ifelse(gt_included_intl, yes, [
- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- dnl to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
- BUILD_INCLUDED_LIBINTL=yes
- fi
-
- dnl Make all variables we use known to autoconf.
- AC_SUBST([BUILD_INCLUDED_LIBINTL])
- AC_SUBST([USE_INCLUDED_LIBINTL])
- AC_SUBST([CATOBJEXT])
-
- dnl For backward compatibility. Some configure.ins may be using this.
- nls_cv_header_intl=
- nls_cv_header_libgt=
-
- dnl For backward compatibility. Some Makefiles may be using this.
- DATADIRNAME=share
- AC_SUBST([DATADIRNAME])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INSTOBJEXT=.mo
- AC_SUBST([INSTOBJEXT])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- GENCAT=gencat
- AC_SUBST([GENCAT])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INTLOBJS=
- if test "$USE_INCLUDED_LIBINTL" = yes; then
- INTLOBJS="\$(GETTOBJS)"
- fi
- AC_SUBST([INTLOBJS])
-
- dnl Enable libtool support if the surrounding package wishes it.
- INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
- AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
- ])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INTLLIBS="$LIBINTL"
- AC_SUBST([INTLLIBS])
-
- dnl Make all documented variables known to autoconf.
- AC_SUBST([LIBINTL])
- AC_SUBST([LTLIBINTL])
- AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
- m4_divert_text([DEFAULTS], [gt_needs=])
- m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
- m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-# iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable GNU libiconv installed).
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- dnl accordingly.
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
- dnl Add $INCICONV to CPPFLAGS before performing the following checks,
- dnl because if the user has installed libiconv and not disabled its use
- dnl via --without-libiconv-prefix, he wants to use it. The first
- dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
- am_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
- AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <stdlib.h>
-#include <iconv.h>
- ]],
- [[iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);]])],
- [am_cv_func_iconv=yes])
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <stdlib.h>
-#include <iconv.h>
- ]],
- [[iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);]])],
- [am_cv_lib_iconv=yes]
- [am_cv_func_iconv=yes])
- LIBS="$am_save_LIBS"
- fi
- ])
- if test "$am_cv_func_iconv" = yes; then
- AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
- dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
- dnl Solaris 10.
- am_save_LIBS="$LIBS"
- if test $am_cv_lib_iconv = yes; then
- LIBS="$LIBS $LIBICONV"
- fi
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
- int result = 0;
- /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
- returns. */
- {
- iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
- if (cd_utf8_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- result |= 1;
- iconv_close (cd_utf8_to_88591);
- }
- }
- /* Test against Solaris 10 bug: Failures are not distinguishable from
- successful returns. */
- {
- iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
- if (cd_ascii_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\263";
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- result |= 2;
- iconv_close (cd_ascii_to_88591);
- }
- }
- /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304";
- static char buf[2] = { (char)0xDE, (char)0xAD };
- const char *inptr = input;
- size_t inbytesleft = 1;
- char *outptr = buf;
- size_t outbytesleft = 1;
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
- result |= 4;
- iconv_close (cd_88591_to_utf8);
- }
- }
-#if 0 /* This bug could be worked around by the caller. */
- /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
- char buf[50];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if ((int)res > 0)
- result |= 8;
- iconv_close (cd_88591_to_utf8);
- }
- }
-#endif
- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
- provided. */
- if (/* Try standardized names. */
- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
- /* Try IRIX, OSF/1 names. */
- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
- /* Try AIX names. */
- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
- /* Try HP-UX names. */
- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- result |= 16;
- return result;
-}]])],
- [am_cv_func_iconv_works=yes],
- [am_cv_func_iconv_works=no],
- [
-changequote(,)dnl
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-changequote([,])dnl
- ])
- LIBS="$am_save_LIBS"
- ])
- case "$am_cv_func_iconv_works" in
- *no) am_func_iconv=no am_cv_lib_iconv=no ;;
- *) am_func_iconv=yes ;;
- esac
+ AC_SUBST(GLIB_COMPILE_SCHEMAS)
+ if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+ ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
else
- am_func_iconv=no am_cv_lib_iconv=no
- fi
- if test "$am_func_iconv" = yes; then
- AC_DEFINE([HAVE_ICONV], [1],
- [Define if you have the iconv() function and it works.])
+ ifelse([$1],,[:],[$1])
fi
- if test "$am_cv_lib_iconv" = yes; then
- AC_MSG_CHECKING([how to link with libiconv])
- AC_MSG_RESULT([$LIBICONV])
- else
- dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
- dnl either.
- CPPFLAGS="$am_save_CPPFLAGS"
- LIBICONV=
- LTLIBICONV=
- fi
- AC_SUBST([LIBICONV])
- AC_SUBST([LTLIBICONV])
-])
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl warnings.
-m4_define([gl_iconv_AC_DEFUN],
- m4_version_prereq([2.64],
- [[AC_DEFUN_ONCE(
- [$1], [$2])]],
- [m4_ifdef([gl_00GNULIB],
- [[AC_DEFUN_ONCE(
- [$1], [$2])]],
- [[AC_DEFUN(
- [$1], [$2])]])]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
- AM_ICONV_LINK
- if test "$am_cv_func_iconv" = yes; then
- AC_MSG_CHECKING([for iconv declaration])
- AC_CACHE_VAL([am_cv_proto_iconv], [
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
- ]],
- [[]])],
- [am_cv_proto_iconv_arg1=""],
- [am_cv_proto_iconv_arg1="const"])
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
- am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- AC_MSG_RESULT([
- $am_cv_proto_iconv])
- AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
- [Define as const if the declaration of iconv() needs const.])
- dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
- m4_ifdef([gl_ICONV_H_DEFAULTS],
- [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
- if test -n "$am_cv_proto_iconv_arg1"; then
- ICONV_CONST="const"
- fi
- ])
- fi
-])
+ GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
- dnl Check for API introduced in Mac OS X 10.2.
- AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
- [gt_cv_func_CFPreferencesCopyAppValue],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <CoreFoundation/CFPreferences.h>]],
- [[CFPreferencesCopyAppValue(NULL, NULL)]])],
- [gt_cv_func_CFPreferencesCopyAppValue=yes],
- [gt_cv_func_CFPreferencesCopyAppValue=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
- fi
- dnl Check for API introduced in Mac OS X 10.3.
- AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <CoreFoundation/CFLocale.h>]],
- [[CFLocaleCopyCurrent();]])],
- [gt_cv_func_CFLocaleCopyCurrent=yes],
- [gt_cv_func_CFLocaleCopyCurrent=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
- AC_SUBST([INTL_MACOSX_LIBS])
-])
+mostlyclean-am: clean-gsettings-schemas
-# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes
- ;;
-*)
- acl_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
- [AS_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld [default=no]])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
-fi
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by $CC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]]* | ?:[[\\/]]*)
- re_direlt='/[[^/]][[^/]]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL([acl_cv_path_LD],
-[if test -z "$LD"; then
- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$acl_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$acl_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT([$LD])
-else
- AC_MSG_RESULT([no])
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
-
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.54])
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- pushdef([Name],[m4_translit([$1],[./+-], [____])])
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
- ac_cv_lib[]Name[]_libs="$LIB[]NAME"
- ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
- ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
- ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
- ])
- LIB[]NAME="$ac_cv_lib[]Name[]_libs"
- LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
- INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
- LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- AC_SUBST([LIB]NAME[_PREFIX])
- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
- dnl results of this search when this library appears as a dependency.
- HAVE_LIB[]NAME=yes
- popdef([NAME])
- popdef([Name])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- pushdef([Name],[m4_translit([$1],[./+-], [____])])
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-
- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
- dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
- dnl because if the user has installed lib[]Name and not disabled its use
- dnl via --without-lib[]Name-prefix, he wants to use it.
- ac_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
- ac_save_LIBS="$LIBS"
- dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
- dnl because these -l options might require -L options that are present in
- dnl LIBS. -l options benefit only from the -L options listed before it.
- dnl Otherwise, add it to the front of LIBS, because it may be a static
- dnl library that depends on another static library that is present in LIBS.
- dnl Static libraries benefit only from the static libraries listed after
- dnl it.
- case " $LIB[]NAME" in
- *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
- *) LIBS="$LIB[]NAME $LIBS" ;;
- esac
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[$3]], [[$4]])],
- [ac_cv_lib[]Name=yes],
- [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
- LIBS="$ac_save_LIBS"
- ])
- if test "$ac_cv_lib[]Name" = yes; then
- HAVE_LIB[]NAME=yes
- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
- AC_MSG_CHECKING([how to link with lib[]$1])
- AC_MSG_RESULT([$LIB[]NAME])
- else
- HAVE_LIB[]NAME=no
- dnl If $LIB[]NAME didn't lead to a usable library, we don't need
- dnl $INC[]NAME either.
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIB[]NAME=
- LTLIB[]NAME=
- LIB[]NAME[]_PREFIX=
- fi
- AC_SUBST([HAVE_LIB]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- AC_SUBST([LIB]NAME[_PREFIX])
- popdef([NAME])
- popdef([Name])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl acl_libext,
-dnl acl_shlibext,
-dnl acl_libname_spec,
-dnl acl_library_names_spec,
-dnl acl_hardcode_libdir_flag_spec,
-dnl acl_hardcode_libdir_separator,
-dnl acl_hardcode_direct,
-dnl acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
- dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
- AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
- AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
- ])
- wl="$acl_cv_wl"
- acl_libext="$acl_cv_libext"
- acl_shlibext="$acl_cv_shlibext"
- acl_libname_spec="$acl_cv_libname_spec"
- acl_library_names_spec="$acl_cv_library_names_spec"
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
- dnl Determine whether the user wants rpath handling at all.
- AC_ARG_ENABLE([rpath],
- [ --disable-rpath do not hardcode runtime library paths],
- :, enable_rpath=yes)
-])
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN([AC_LIB_FROMPACKAGE],
-[
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- define([acl_frompackage_]NAME, [$2])
- popdef([NAME])
- pushdef([PACK],[$2])
- pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- define([acl_libsinpackage_]PACKUP,
- m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
- popdef([PACKUP])
- popdef([PACK])
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
- pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
- dnl Autoconf >= 2.61 supports dots in --with options.
- pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_ARG_WITH(P_A_C_K[-prefix],
-[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
- --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
- additional_libdir="$withval/$acl_libdirstem2"
- fi
- fi
- fi
-])
- dnl Search the library and its dependencies in $additional_libdir and
- dnl $LDFLAGS. Using breadth-first-seach.
- LIB[]NAME=
- LTLIB[]NAME=
- INC[]NAME=
- LIB[]NAME[]_PREFIX=
- dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
- dnl computed. So it has to be reset here.
- HAVE_LIB[]NAME=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='$1 $2'
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
- dnl or AC_LIB_HAVE_LINKFLAGS call.
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
- else
- dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
- dnl that this library doesn't exist. So just drop it.
- :
- fi
- else
- dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME/$LTLIBNAME.
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- dnl The same code as in the loop below:
- dnl First look for a shared library.
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- dnl Then look for a static library.
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- dnl First look for a shared library.
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- dnl Then look for a static library.
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- dnl Found the library.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "$enable_rpath" = no \
- || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
- dnl No hardcoding is needed.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- dnl The hardcoding into $LIBNAME is system dependent.
- if test "$acl_hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding. This affects only
- dnl very old systems.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- fi
- fi
- dnl Assume the include files are nearby.
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- if test "$name" = '$1'; then
- LIB[]NAME[]_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- */$acl_libdirstem2 | */$acl_libdirstem2/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
- if test "$name" = '$1'; then
- LIB[]NAME[]_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- dnl Potentially add $additional_includedir to $INCNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's /usr/local/include and we are using GCC on Linux,
- dnl 3. if it's already present in $CPPFLAGS or the already
- dnl constructed $INCNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $INCNAME.
- INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- dnl Look for dependencies.
- if test -n "$found_la"; then
- dnl Read the .la file. It defines the variables
- dnl dlname, library_names, old_library, dependency_libs, current,
- dnl age, revision, installed, dlopen, dlpreopen, libdir.
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- dnl We use only dependency_libs.
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 3. if it's already present in $LDFLAGS or the already
- dnl constructed $LIBNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LIBNAME.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LTLIBNAME.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- dnl Handle this in the next round.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- dnl Handle this in the next round. Throw away the .la's
- dnl directory; it is already contained in a preceding -L
- dnl option.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- dnl Most likely an immediate library name.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
- ;;
- esac
- done
- fi
- else
- dnl Didn't find the library; assume it is in the system directories
- dnl known to the linker and runtime loader. (All the system
- dnl directories known to the linker should also be known to the
- dnl runtime loader, otherwise the system is severely misconfigured.)
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- dnl Weird platform: only the last -rpath option counts, the user must
- dnl pass all path elements in one option. We can arrange that for a
- dnl single library, but not when more than one $LIBNAMEs are used.
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- else
- dnl The -rpath options are cumulative.
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- dnl When using libtool, the option that works for both libraries and
- dnl executables is -R. The -R options are cumulative.
- for found_dir in $ltrpathdirs; do
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
- done
- fi
- popdef([P_A_C_K])
- popdef([PACKLIBS])
- popdef([PACKUP])
- popdef([PACK])
- popdef([NAME])
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
- for element in [$2]; do
- haveit=
- for x in $[$1]; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- [$1]="${[$1]}${[$1]:+ }$element"
- fi
- done
-])
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
- AC_REQUIRE([AC_LIB_RPATH])
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- $1=
- if test "$enable_rpath" != no; then
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode directories into the resulting
- dnl binary.
- rpathdirs=
- next=
- for opt in $2; do
- if test -n "$next"; then
- dir="$next"
- dnl No need to hardcode the standard /usr/lib.
- if test "X$dir" != "X/usr/$acl_libdirstem" \
- && test "X$dir" != "X/usr/$acl_libdirstem2"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next=
- else
- case $opt in
- -L) next=yes ;;
- -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
- dnl No need to hardcode the standard /usr/lib.
- if test "X$dir" != "X/usr/$acl_libdirstem" \
- && test "X$dir" != "X/usr/$acl_libdirstem2"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next= ;;
- *) next= ;;
- esac
- fi
- done
- if test "X$rpathdirs" != "X"; then
- if test -n ""$3""; then
- dnl libtool is used for linking. Use -R options.
- for dir in $rpathdirs; do
- $1="${$1}${$1:+ }-R$dir"
- done
- else
- dnl The linker is used for linking directly.
- if test -n "$acl_hardcode_libdir_separator"; then
- dnl Weird platform: only the last -rpath option counts, the user
- dnl must pass all path elements in one option.
- alldirs=
- for dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- $1="$flag"
- else
- dnl The -rpath options are cumulative.
- for dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- $1="${$1}${$1:+ }$flag"
- done
- fi
- fi
- fi
- fi
- fi
- AC_SUBST([$1])
-])
-
-# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
- AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib-prefix],
-[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
- --without-lib-prefix don't search for libraries in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- fi
- fi
-])
- if test $use_additional = yes; then
- dnl Potentially add $additional_includedir to $CPPFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- for x in $CPPFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $CPPFLAGS.
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- dnl Potentially add $additional_libdir to $LDFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- for x in $LDFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LDFLAGS.
- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
- dnl Unfortunately, prefix and exec_prefix get only finally determined
- dnl at the end of configure.
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-])
+.SECONDARY: $(gsettings_SCHEMAS)
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- $1
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-])
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
+ if test -n "$^"; then \
+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+ fi
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a variable acl_libdirstem, containing the basename of the libdir, either
-dnl "lib" or "lib64" or "lib/64",
-dnl - a variable acl_libdirstem2, as a secondary possible value for
-dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
-dnl "lib/amd64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
- dnl There is no formal standard regarding lib and lib64.
- dnl On glibc systems, the current practice is that on a system supporting
- dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
- dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
- dnl the compiler's default mode by looking at the compiler's library search
- dnl path. If at least one of its elements ends in /lib64 or points to a
- dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
- dnl Otherwise we use the default, namely "lib".
- dnl On Solaris systems, the current practice is that on a system supporting
- dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
- dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
- dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
- AC_REQUIRE([AC_CANONICAL_HOST])
- acl_libdirstem=lib
- acl_libdirstem2=
- case "$host_os" in
- solaris*)
- dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
- dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
- dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
- dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
- dnl symlink is missing, so we set acl_libdirstem2 too.
- AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
- [AC_EGREP_CPP([sixtyfour bits], [
-#ifdef _LP64
-sixtyfour bits
-#endif
- ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
- ])
- if test $gl_cv_solaris_64bit = yes; then
- acl_libdirstem=lib/64
- case "$host_cpu" in
- sparc*) acl_libdirstem2=lib/sparcv9 ;;
- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
- esac
- fi
- ;;
- *)
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= }"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- */../ | */.. )
- # Better ignore directories of this form. They are misleading.
- ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
- ;;
- esac
- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+uninstall-gsettings-schemas:
+ @$(NORMAL_UNINSTALL)
+ @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+ rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+ _GSETTINGS_SUBST(GSETTINGS_RULES)
])
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
[
- AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE([nls],
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT([$USE_NLS])
- AC_SUBST([USE_NLS])
-])
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
# serial 1 (pkg-config-0.24)
fi[]dnl
])# PKG_CHECK_MODULES
-# po.m4 serial 21 (gettext-0.18.3)
-dnl Copyright (C) 1995-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AC_PROG_MKDIR_P])dnl
- AC_REQUIRE([AC_PROG_SED])dnl
- AC_REQUIRE([AM_NLS])dnl
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
-
- dnl Search for GNU msgfmt in the PATH.
- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
- dnl The second test excludes FreeBSD msgfmt.
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
- dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([MSGFMT_015])
-changequote(,)dnl
- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
- *) GMSGFMT_015=$GMSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([GMSGFMT_015])
-
- dnl Search for GNU xgettext 0.12 or newer in the PATH.
- dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
- dnl The second test excludes FreeBSD xgettext.
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- dnl Remove leftover from FreeBSD xgettext call.
- rm -f messages.po
-
- dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
- case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
- *) XGETTEXT_015=$XGETTEXT ;;
- esac
-changequote([,])dnl
- AC_SUBST([XGETTEXT_015])
-
- dnl Search for GNU msgmerge 0.11 or newer in the PATH.
- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
- [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
- dnl Installation directories.
- dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
- dnl have to define it here, so that it can be used in po/Makefile.
- test -n "$localedir" || localedir='${datadir}/locale'
- AC_SUBST([localedir])
-
- dnl Support for AM_XGETTEXT_OPTION.
- test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
- AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
- AC_CONFIG_COMMANDS([po-directories], [[
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- # Treat a directory as a PO directory if and only if it has a
- # POTFILES.in file. This allows packages to have multiple PO
- # directories under different names or in different locations.
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- gt_tab=`printf '\t'`
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
- # on $ac_dir but don't depend on user-specified configuration
- # parameters.
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
- fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- done
- fi
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
- if test -f "$f"; then
- case "$f" in
- *.orig | *.bak | *~) ;;
- *) cat "$f" >> "$ac_dir/Makefile" ;;
- esac
- fi
- done
- fi
- ;;
- esac
- done]],
- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
- LINGUAS="${LINGUAS-%UNSET%}"
- ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
- # When this code is run, in config.status, two variables have already been
- # set:
- # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
- # - LINGUAS is the value of the environment variable LINGUAS at configure
- # time.
-
-changequote(,)dnl
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
- # Find a way to echo strings without interpreting backslash.
- if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='echo'
- else
- if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='printf %s\n'
- else
- echo_func () {
- cat <<EOT
-$*
-EOT
- }
- gt_echo='echo_func'
- fi
- fi
-
- # A sed script that extracts the value of VARIABLE from a Makefile.
- tab=`printf '\t'`
- sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
- # Seen the first line of the variable definition.
- s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
- ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
- # Set POTFILES to the value of the Makefile variable POTFILES.
- sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
- POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
- # Compute POTFILES_DEPS as
- # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
- POTFILES_DEPS=
- for file in $POTFILES; do
- POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
- done
- POMAKEFILEDEPS=""
-
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
- sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
- ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
- fi
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- # Compute PROPERTIESFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
- # Compute CLASSFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
- # Compute QMFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
- # Compute MSGFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
- # Compute RESOURCESDLLFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- PROPERTIESFILES=
- CLASSFILES=
- QMFILES=
- MSGFILES=
- RESOURCESDLLFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
- CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
- QMFILES="$QMFILES $srcdirpre$lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- JAVACATALOGS=
- QTCATALOGS=
- TCLCATALOGS=
- CSHARPCATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
- QTCATALOGS="$QTCATALOGS $lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
- done
- fi
-
- sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
- tab=`printf '\t'`
- if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
- if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
- if test -n "$POMAKEFILEDEPS"; then
- cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
- fi
- mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
- XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
- AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
- XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
-
-# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ([2.50])
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case "[$]$1" in
- [[\\/]]* | ?:[[\\/]]*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$][$1])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST([$1])dnl
-])
-
-# 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.6], [],
+m4_if([$1], [1.14.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
# 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.6])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
: ${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])
fi
rm -f conftest.lib libconftest.a
])
- ])
+ AC_LANG_POP([C])])
case $am_cv_ar_interface in
ar)
# 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
#
# 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,
# 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
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
# _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
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],
# 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
: > 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
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
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}
# 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
# 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='\'
# 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
# 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.
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"])`
# 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],
# 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])
# -----------------------------------------------
# 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
# 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:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+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
[_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
-])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+# 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: <http://austingroupbugs.net/view.php?id=542>
+
+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: <http://www.gnu.org/software/coreutils/>.
+
+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 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.
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.
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],
# 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.
_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
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],
$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
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.
+# 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 1
-
# AM_PROG_MKDIR_P
# ---------------
-# Check for `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 FIXME we are no longer going to remove this! adjust warning
+dnl FIXME message accordingly.
+AC_DIAGNOSE([obsolete],
+[$0: this macro is deprecated, and will soon be removed.
+You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead,
+and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.])
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.
# 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],
# --------------------
# 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)
# ------------------------
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Check to make sure that the build environment is sane. -*- Autoconf -*-
+# 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.
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# _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) 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_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+# 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.
# 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='
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
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) 2001, 2003, 2005, 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 1
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[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 do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+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.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# 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.
# 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.
# 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
# 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],
- # 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])
+ [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
+
+ # 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 <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/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
+m4_include([m4/gettext.m4])
+m4_include([m4/iconv.m4])
+m4_include([m4/lib-ld.m4])
+m4_include([m4/lib-link.m4])
+m4_include([m4/lib-prefix.m4])
+m4_include([m4/nls.m4])
+m4_include([m4/po.m4])
+m4_include([m4/progtest.m4])
/* Use libatasmart */
#undef HAVE_ATASMART
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
CoreFoundation framework. */
#undef HAVE_CFLOCALECOPYCURRENT
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
the CoreFoundation framework. */
#undef HAVE_CFPREFERENCESCOPYAPPVALUE
*/
#undef HAVE_DCGETTEXT
-/* Use gconf2 */
-#undef HAVE_GCONF2
-
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
/* Use GTOP */
#undef HAVE_GTOP
-/* Define if you have the iconv() function and it works. */
+/* Define if you have the iconv() function. */
#undef HAVE_ICONV
/* Define to 1 if you have the <inttypes.h> header file. */
/* Remote monitoring enabled */
#undef HAVE_REMOTE_SUPPORT
-/* Define to 1 if you have the <sensors/errors.h> header file. */
-#undef HAVE_SENSORS_ERRORS_H
+/* Define to 1 if you have the <sensors/error.h> header file. */
+#undef HAVE_SENSORS_ERROR_H
/* Define to 1 if you have the <sensors/sensors.h> header file. */
#undef HAVE_SENSORS_SENSORS_H
/* Use Unity */
#undef HAVE_UNITY
-/* 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
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for psensor 1.0.2.
+# Generated by GNU Autoconf 2.69 for psensor 1.1.1.
#
# Report bugs to <jeanfi@gmail.com>.
#
# Identity of this package.
PACKAGE_NAME='psensor'
PACKAGE_TARNAME='psensor'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='psensor 1.0.2'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='psensor 1.1.1'
PACKAGE_BUGREPORT='jeanfi@gmail.com'
PACKAGE_URL='http://wpitchoune.net/psensor'
CPPCHECK_FALSE
CPPCHECK_TRUE
HAVE_CPPCHECK
+ASCIIDOC_FALSE
+ASCIIDOC_TRUE
+ASCIIDOC
HELP2MAN
GTOP_FALSE
GTOP_TRUE
ATASMART_TRUE
ATASMART_LIBS
ATASMART_CFLAGS
-GCONF_FALSE
-GCONF_TRUE
-GCONF_LIBS
-GCONF_CFLAGS
GTK_FALSE
GTK_TRUE
GTK_LIBS
X11_TRUE
X11_LIBS
X11_CFLAGS
+SENSORS_LIBS
+PTHREAD_LIBS
+GSETTINGS_RULES
+GLIB_COMPILE_SCHEMAS
+gsettingsschemadir
PKG_CONFIG_LIBDIR
PKG_CONFIG_PATH
PKG_CONFIG
-SENSORS_LIBS
-PTHREAD_LIBS
-GCONF_SCHEMAS_INSTALL_FALSE
-GCONF_SCHEMAS_INSTALL_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
-GCONFTOOL
+GSETTINGS_DISABLE_SCHEMAS_COMPILE
POSUB
LTLIBINTL
LIBINTL
build_vendor
build_cpu
build
-XGETTEXT_EXTRA_OPTIONS
MSGMERGE
XGETTEXT_015
XGETTEXT
MSGFMT_015
GMSGFMT
MSGFMT
-GETTEXT_MACRO_VERSION
USE_NLS
-SED
LIBOBJS
EGREP
GREP
LDFLAGS
CFLAGS
CC
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
am__untar
am__tar
AMTAR
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_silent_rules
enable_dependency_tracking
enable_largefile
with_x
enable_rpath
with_libiconv_prefix
with_libintl_prefix
-with_gconf_source
-with_gconf_schema_file_dir
-enable_schemas_install
+enable_schemas_compile
with_libatiadl
with_gtop
'
XEXT_LIBS
GTK_CFLAGS
GTK_LIBS
-GCONF_CFLAGS
-GCONF_LIBS
ATASMART_CFLAGS
ATASMART_LIBS
LIBNOTIFY_CFLAGS
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures psensor 1.0.2 to adapt to many kinds of systems.
+\`configure' configures psensor 1.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of psensor 1.0.2:";;
+ short | recursive ) echo "Configuration of psensor 1.1.1:";;
esac
cat <<\_ACEOF
--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]
- --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
--disable-largefile omit support for large files
--disable-nls do not use Native Language Support
--disable-rpath do not hardcode runtime library paths
- --disable-schemas-install
- Disable the schemas installation
+ --disable-schemas-compile
+ Disable regeneration of gschemas.compiled on install
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-x use the X Window System
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
--with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
--without-libiconv-prefix don't search for libiconv in includedir and libdir
--with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
--without-libintl-prefix don't search for libintl in includedir and libdir
- --with-gconf-source=sourceaddress
- Config database for installing schema files.
- --with-gconf-schema-file-dir=dir
- Directory for installing schema files.
--with-libatiadl=DIR use libatiadlxx in DIR
--with-gtop=yes|no use gtop
XEXT_LIBS linker flags for XEXT, overriding pkg-config
GTK_CFLAGS C compiler flags for GTK, overriding pkg-config
GTK_LIBS linker flags for GTK, overriding pkg-config
- GCONF_CFLAGS
- C compiler flags for GCONF, overriding pkg-config
- GCONF_LIBS linker flags for GCONF, overriding pkg-config
ATASMART_CFLAGS
C compiler flags for ATASMART, overriding pkg-config
ATASMART_LIBS
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-psensor configure 1.0.2
+psensor configure 1.1.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by psensor $as_me 1.0.2, which was
+It was created by psensor $as_me 1.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
-am__api_version='1.11'
+am__api_version='1.14'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
{ $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='
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
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.
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
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.
{ $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.
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-silent-rules was given.
+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;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
# Define the identity of the package.
PACKAGE='psensor'
- VERSION='1.0.2'
+ VERSION='1.1.1'
cat >>confdefs.h <<_ACEOF
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:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+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
# in the wild :-( We should find a proper way to deprecate it ...
AMTAR='$${TAR-tar}'
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
+
am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+# 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: <http://austingroupbugs.net/view.php?id=542>
+
+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: <http://www.gnu.org/software/coreutils/>.
+
+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_config_headers="$ac_config_headers config.h"
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"
_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
# 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
: > 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
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
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}
fi
-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 ${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;
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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
- for ac_i in 1 2 3 4 5 6 7; do
- ac_script="$ac_script$as_nl$ac_script"
- done
- echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
- { ac_script=; unset ac_script;}
- if test -z "$SED"; then
- ac_path_SED_found=false
- # Loop through the user's path and test for each of PROGNAME-LIST
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
- 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
-*GNU*)
- ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
- ac_count=0
- $as_echo_n 0123456789 >"conftest.in"
- while :
- do
- cat "conftest.in" "conftest.in" >"conftest.tmp"
- mv "conftest.tmp" "conftest.in"
- cp "conftest.in" "conftest.nl"
- $as_echo '' >> "conftest.nl"
- "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
- diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
- as_fn_arith $ac_count + 1 && ac_count=$as_val
- if test $ac_count -gt ${ac_path_SED_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_SED="$ac_path_SED"
- ac_path_SED_max=$ac_count
- fi
- # 10*(2^10) chars as input seems more than enough
- test $ac_count -gt 10 && break
- done
- rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
- $ac_path_SED_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_SED"; then
- as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
- fi
-else
- ac_cv_path_SED=$SED
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
- rm -f conftest.sed
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
- GETTEXT_MACRO_VERSION=0.18
-
-
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
# Find out how to test for executable files. Don't use a zero-byte file,
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
# Find out how to test for executable files. Don't use a zero-byte file,
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
# Find out how to test for executable files. Don't use a zero-byte file,
test -n "$localedir" || localedir='${datadir}/locale'
- test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
-
-
ac_config_commands="$ac_config_commands po-directories"
-
# Check whether --with-gnu-ld was given.
if test "${with_gnu_ld+set}" = set; then :
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
# Prepare PATH_SEPARATOR.
# The user is always right.
if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
fi
-
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
esac
case $ac_prog in
# Accept absolute paths.
- [\\/]* | ?:[\\/]*)
+ [\\/]* | [A-Za-z]:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
done
test -z "$LD" && LD="$ac_prog"
;;
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do
- IFS="$acl_save_ifs"
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
acl_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
+ # but apparently some GNU ld's only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
+ case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
+ test "$with_gnu_ld" != no && break ;;
*)
- test "$with_gnu_ld" != yes && break
- ;;
+ test "$with_gnu_ld" != yes && break ;;
esac
fi
done
- IFS="$acl_save_ifs"
+ IFS="$ac_save_ifs"
else
acl_cv_path_LD="$LD" # Let the user override the test with a path.
fi
if ${acl_cv_prog_gnu_ld+:} false; then :
$as_echo_n "(cached) " >&6
else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
case `$LD -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes
- ;;
+ acl_cv_prog_gnu_ld=yes ;;
*)
- acl_cv_prog_gnu_ld=no
- ;;
+ acl_cv_prog_gnu_ld=no ;;
esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
$as_echo "$acl_cv_rpath" >&6; }
wl="$acl_cv_wl"
- acl_libext="$acl_cv_libext"
- acl_shlibext="$acl_cv_shlibext"
- acl_libname_spec="$acl_cv_libname_spec"
- acl_library_names_spec="$acl_cv_library_names_spec"
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
# Check whether --enable-rpath was given.
if test "${enable_rpath+set}" = set; then :
enableval=$enable_rpath; :
-
- acl_libdirstem=lib
- acl_libdirstem2=
- case "$host_os" in
- solaris*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#ifdef _LP64
-sixtyfour bits
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
- gl_cv_solaris_64bit=yes
-else
- gl_cv_solaris_64bit=no
-fi
-rm -f conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
- if test $gl_cv_solaris_64bit = yes; then
- acl_libdirstem=lib/64
- case "$host_cpu" in
- sparc*) acl_libdirstem2=lib/sparcv9 ;;
- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
- esac
- fi
- ;;
- *)
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= }"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- */../ | */.. )
- # Better ignore directories of this form. They are misleading.
- ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
- ;;
- esac
- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-
-
-
-
+ acl_libdirstem=lib
+ searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test -n "$searchpath"; then
+ acl_save_IFS="${IFS= }"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib64 ) acl_libdirstem=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_save_IFS"
+ fi
else
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
- if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
- additional_libdir="$withval/$acl_libdirstem2"
- fi
fi
fi
LIBICONV=
LTLIBICONV=
INCICONV=
- LIBICONV_PREFIX=
- HAVE_LIBICONV=
rpathdirs=
ltrpathdirs=
names_already_handled=
done
if test -z "$already_handled"; then
names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
eval value=\"\$HAVE_LIB$uppername\"
if test -n "$value"; then
if test "$value" = yes; then
found_la=
found_so=
found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
+ if test -n "$shlibext" \
+ && { test -f "$additional_libdir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+ found_dir="$additional_libdir"
+ if test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_so="$additional_libdir/lib$name.$shlibext"
else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
+ found_so="$additional_libdir/lib$name.dll.a"
fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
fi
fi
fi
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
+ if test -n "$shlibext" \
+ && { test -f "$dir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$dir/lib$name.dll.a"; }; }; then
+ found_dir="$dir"
+ if test -f "$dir/lib$name.$shlibext"; then
+ found_so="$dir/lib$name.$shlibext"
else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
+ found_so="$dir/lib$name.dll.a"
fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
fi
fi
;;
if test "X$found_dir" != "X"; then
LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no \
- || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
else
haveit=
if test -z "$haveit"; then
ltrpathdirs="$ltrpathdirs $found_dir"
fi
- if test "$acl_hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes; then
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
haveit=
for x in $rpathdirs; do
if test -z "$haveit"; then
LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
fi
- if test "$acl_hardcode_minus_L" != no; then
+ if test "$hardcode_minus_L" != no; then
LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
else
LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
case "$found_dir" in
*/$acl_libdirstem | */$acl_libdirstem/)
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- if test "$name" = 'iconv'; then
- LIBICONV_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- */$acl_libdirstem2 | */$acl_libdirstem2/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
- if test "$name" = 'iconv'; then
- LIBICONV_PREFIX="$basedir"
- fi
additional_includedir="$basedir/include"
;;
esac
case "$dep" in
-L*)
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
if test -n "$GCC"; then
case $host_os in
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
done
done
if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
+ if test -n "$hardcode_libdir_separator"; then
alldirs=
for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
done
acl_save_libdir="$libdir"
libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ eval flag=\"$hardcode_libdir_flag_spec\"
libdir="$acl_save_libdir"
LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
else
for found_dir in $rpathdirs; do
acl_save_libdir="$libdir"
libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ eval flag=\"$hardcode_libdir_flag_spec\"
libdir="$acl_save_libdir"
LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
done
-
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
if test $gt_api_version -ge 3; then
- gt_revision_test_code='
+ gt_revision_test_code='[
#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-'
+]'
else
gt_revision_test_code=
fi
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;
-
int
main ()
{
-
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
-
;
return 0;
}
am_cv_lib_iconv=no
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <stdlib.h>
#include <iconv.h>
-
int
main ()
{
iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
LIBS="$LIBS $LIBICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <stdlib.h>
#include <iconv.h>
-
int
main ()
{
iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
$as_echo "$am_cv_func_iconv" >&6; }
if test "$am_cv_func_iconv" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- am_save_LIBS="$LIBS"
- if test $am_cv_lib_iconv = yes; then
- LIBS="$LIBS $LIBICONV"
- fi
- if test "$cross_compiling" = yes; then :
-
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
- int result = 0;
- /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
- returns. */
- {
- iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
- if (cd_utf8_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- result |= 1;
- iconv_close (cd_utf8_to_88591);
- }
- }
- /* Test against Solaris 10 bug: Failures are not distinguishable from
- successful returns. */
- {
- iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
- if (cd_ascii_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\263";
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- result |= 2;
- iconv_close (cd_ascii_to_88591);
- }
- }
- /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304";
- static char buf[2] = { (char)0xDE, (char)0xAD };
- const char *inptr = input;
- size_t inbytesleft = 1;
- char *outptr = buf;
- size_t outbytesleft = 1;
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
- result |= 4;
- iconv_close (cd_88591_to_utf8);
- }
- }
-#if 0 /* This bug could be worked around by the caller. */
- /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
- char buf[50];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if ((int)res > 0)
- result |= 8;
- iconv_close (cd_88591_to_utf8);
- }
- }
-#endif
- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
- provided. */
- if (/* Try standardized names. */
- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
- /* Try IRIX, OSF/1 names. */
- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
- /* Try AIX names. */
- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
- /* Try HP-UX names. */
- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- result |= 16;
- return result;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- am_cv_func_iconv_works=yes
-else
- am_cv_func_iconv_works=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
- LIBS="$am_save_LIBS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
- case "$am_cv_func_iconv_works" in
- *no) am_func_iconv=no am_cv_lib_iconv=no ;;
- *) am_func_iconv=yes ;;
- esac
- else
- am_func_iconv=no am_cv_lib_iconv=no
- fi
- if test "$am_func_iconv" = yes; then
$as_echo "#define HAVE_ICONV 1" >>confdefs.h
-
-
-
-
use_additional=yes
acl_save_prefix="$prefix"
else
additional_includedir="$withval/include"
additional_libdir="$withval/$acl_libdirstem"
- if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
- additional_libdir="$withval/$acl_libdirstem2"
- fi
fi
fi
LIBINTL=
LTLIBINTL=
INCINTL=
- LIBINTL_PREFIX=
- HAVE_LIBINTL=
rpathdirs=
ltrpathdirs=
names_already_handled=
done
if test -z "$already_handled"; then
names_already_handled="$names_already_handled $name"
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
eval value=\"\$HAVE_LIB$uppername\"
if test -n "$value"; then
if test "$value" = yes; then
found_la=
found_so=
found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
if test $use_additional = yes; then
- dir="$additional_libdir"
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
+ if test -n "$shlibext" \
+ && { test -f "$additional_libdir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$additional_libdir/lib$name.dll.a"; }; }; then
+ found_dir="$additional_libdir"
+ if test -f "$additional_libdir/lib$name.$shlibext"; then
+ found_so="$additional_libdir/lib$name.$shlibext"
else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
+ found_so="$additional_libdir/lib$name.dll.a"
fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
+ else
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
fi
fi
fi
case "$x" in
-L*)
dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
+ if test -n "$shlibext" \
+ && { test -f "$dir/lib$name.$shlibext" \
+ || { test "$shlibext" = dll \
+ && test -f "$dir/lib$name.dll.a"; }; }; then
+ found_dir="$dir"
+ if test -f "$dir/lib$name.$shlibext"; then
+ found_so="$dir/lib$name.$shlibext"
else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
+ found_so="$dir/lib$name.dll.a"
fi
- fi
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
+ else
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
fi
fi
;;
if test "X$found_dir" != "X"; then
LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
if test "X$found_so" != "X"; then
- if test "$enable_rpath" = no \
- || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
else
haveit=
if test -z "$haveit"; then
ltrpathdirs="$ltrpathdirs $found_dir"
fi
- if test "$acl_hardcode_direct" = yes; then
+ if test "$hardcode_direct" = yes; then
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
haveit=
for x in $rpathdirs; do
if test -z "$haveit"; then
LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir"
fi
- if test "$acl_hardcode_minus_L" != no; then
+ if test "$hardcode_minus_L" != no; then
LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
else
LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name"
case "$found_dir" in
*/$acl_libdirstem | */$acl_libdirstem/)
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- if test "$name" = 'intl'; then
- LIBINTL_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- */$acl_libdirstem2 | */$acl_libdirstem2/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
- if test "$name" = 'intl'; then
- LIBINTL_PREFIX="$basedir"
- fi
additional_includedir="$basedir/include"
;;
esac
case "$dep" in
-L*)
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
if test -n "$GCC"; then
case $host_os in
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
done
done
if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
+ if test -n "$hardcode_libdir_separator"; then
alldirs=
for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
done
acl_save_libdir="$libdir"
libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ eval flag=\"$hardcode_libdir_flag_spec\"
libdir="$acl_save_libdir"
LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
else
for found_dir in $rpathdirs; do
acl_save_libdir="$libdir"
libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
+ eval flag=\"$hardcode_libdir_flag_spec\"
libdir="$acl_save_libdir"
LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
done
done
fi
-
-
-
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
$as_echo_n "checking for GNU gettext in libintl... " >&6; }
if eval \${$gt_func_gnugettext_libintl+:} false; then :
LIBS="$LIBS $LIBINTL"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
"C"
#endif
const char *_nl_expand_alias (const char *);
-
int
main ()
{
-
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
;
return 0;
}
LIBS="$LIBS $LIBICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
#include <libintl.h>
$gt_revision_test_code
extern int _nl_msg_cat_cntr;
"C"
#endif
const char *_nl_expand_alias (const char *);
-
int
main ()
{
-
bindtextdomain ("", "");
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
-
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+ eval "$gt_func_gnugettext_libintl=yes"
fi
rm -f core conftest.err conftest.$ac_objext \
-# Gconf
-# Extract the first word of "gconftool-2", so it can be a program name with args.
-set dummy gconftool-2; ac_word=$2
+# Gsettings
+
+
+ # Check whether --enable-schemas-compile was given.
+if test "${enable_schemas_compile+set}" = set; then :
+ enableval=$enable_schemas_compile; case ${enableval} in
+ yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;;
+ no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
+ esac
+fi
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; 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_GCONFTOOL+:} false; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $GCONFTOOL in
+ case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
- ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
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_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+ 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
fi
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
;;
esac
fi
-GCONFTOOL=$ac_cv_path_GCONFTOOL
-if test -n "$GCONFTOOL"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
-$as_echo "$GCONFTOOL" >&6; }
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_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
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
else
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
-
-# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then :
- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.16
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
+ PKG_CONFIG=""
+ fi
+fi
+ gsettingsschemadir=${datadir}/glib-2.0/schemas
+
+ if test x$cross_compiling != xyes; then
+ GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+ else
+ # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
+set dummy glib-compile-schemas; 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_GLIB_COMPILE_SCHEMAS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GLIB_COMPILE_SCHEMAS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GLIB_COMPILE_SCHEMAS="$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
+done
+ done
+IFS=$as_save_IFS
+ ;;
+esac
+fi
+GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
+if test -n "$GLIB_COMPILE_SCHEMAS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
+$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+ fi
- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+ if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+ as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
+ else
+ :
fi
+ GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
-# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then :
- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-fi
+mostlyclean-am: clean-gsettings-schemas
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p $(@D) && touch $@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+ @$(NORMAL_INSTALL)
+ if test -n "$^"; then \
+ test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+ $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+ fi
+
+uninstall-gsettings-schemas:
+ @$(NORMAL_UNINSTALL)
+ @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+ test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+ rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+ $(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail " </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
+endif
+'
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
- # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then :
- enableval=$enable_schemas_install; case ${enableval} in
- yes|no) ;;
- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
- esac
-fi
- if test "$enable_schemas_install" != no; then
- GCONF_SCHEMAS_INSTALL_TRUE=
- GCONF_SCHEMAS_INSTALL_FALSE='#'
-else
- GCONF_SCHEMAS_INSTALL_TRUE='#'
- GCONF_SCHEMAS_INSTALL_FALSE=
-fi
fi
-for ac_header in sensors/sensors.h sensors/errors.h
+for ac_header in sensors/sensors.h sensors/error.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
### Required
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_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
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; 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_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_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
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
- PKG_CONFIG=""
- fi
-fi
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11" >&5
$as_echo_n "checking for X11... " >&6; }
-# Check GCONF
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
-$as_echo_n "checking for GCONF... " >&6; }
-
-if test -n "$GCONF_CFLAGS"; then
- pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$GCONF_LIBS"; then
- pkg_cv_GCONF_LIBS="$GCONF_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-2.0" 2>&1`
- else
- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-2.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GCONF_PKG_ERRORS" >&5
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"gconf2 missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"gconf2 missing psensor will not be built\"" >&2;}
-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}: WARNING: \"gconf2 missing psensor will not be built\"" >&5
-$as_echo "$as_me: WARNING: \"gconf2 missing psensor will not be built\"" >&2;}
-else
- GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
- GCONF_LIBS=$pkg_cv_GCONF_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_GCONF2 1" >>confdefs.h
-
-fi
- if test -n "$GCONF_LIBS"; then
- GCONF_TRUE=
- GCONF_FALSE='#'
-else
- GCONF_TRUE='#'
- GCONF_FALSE=
-fi
-
-
-
-
### Optional
# check libatasmart
pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
- ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11.99\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c >= 0.11.99") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "json-c" 2>/dev/null`
+ pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "json-c >= 0.11.99" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
pkg_cv_JSON_LIBS="$JSON_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c\""; } >&5
- ($PKG_CONFIG --exists --print-errors "json-c") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-c >= 0.11.99\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-c >= 0.11.99") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json-c" 2>/dev/null`
+ pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json-c >= 0.11.99" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c" 2>&1`
+ JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-c >= 0.11.99" 2>&1`
else
- JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c" 2>&1`
+ JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-c >= 0.11.99" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$JSON_PKG_ERRORS" >&5
pkg_cv_JSON_CFLAGS="$JSON_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json\""; } >&5
- ($PKG_CONFIG --exists --print-errors "json") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json >= 0.11.99\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json >= 0.11.99") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "json" 2>/dev/null`
+ pkg_cv_JSON_CFLAGS=`$PKG_CONFIG --cflags "json >= 0.11.99" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
pkg_cv_JSON_LIBS="$JSON_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json\""; } >&5
- ($PKG_CONFIG --exists --print-errors "json") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json >= 0.11.99\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json >= 0.11.99") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json" 2>/dev/null`
+ pkg_cv_JSON_LIBS=`$PKG_CONFIG --libs "json >= 0.11.99" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json" 2>&1`
+ JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json >= 0.11.99" 2>&1`
else
- JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json" 2>&1`
+ JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json >= 0.11.99" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$JSON_PKG_ERRORS" >&5
done
+# Extract the first word of "asciidoc", so it can be a program name with args.
+set dummy asciidoc; 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_ASCIIDOC+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$ASCIIDOC"; then
+ ac_cv_prog_ASCIIDOC="$ASCIIDOC" # 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_ASCIIDOC="yes"
+ $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
+ASCIIDOC=$ac_cv_prog_ASCIIDOC
+if test -n "$ASCIIDOC"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASCIIDOC" >&5
+$as_echo "$ASCIIDOC" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test -n "$ASCIIDOC"; then
+ ASCIIDOC_TRUE=
+ ASCIIDOC_FALSE='#'
+else
+ ASCIIDOC_TRUE='#'
+ ASCIIDOC_FALSE=
+fi
+
+
# Extract the first word of "cppcheck", so it can be a program name with args.
set dummy cppcheck; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
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='#'
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
- as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${X11_TRUE}" && test -z "${X11_FALSE}"; then
as_fn_error $? "conditional \"X11\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
as_fn_error $? "conditional \"GTK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${GCONF_TRUE}" && test -z "${GCONF_FALSE}"; then
- as_fn_error $? "conditional \"GCONF\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${ATASMART_TRUE}" && test -z "${ATASMART_FALSE}"; then
as_fn_error $? "conditional \"ATASMART\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
as_fn_error $? "conditional \"GTOP\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${ASCIIDOC_TRUE}" && test -z "${ASCIIDOC_FALSE}"; then
+ as_fn_error $? "conditional \"ASCIIDOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${CPPCHECK_TRUE}" && test -z "${CPPCHECK_FALSE}"; then
as_fn_error $? "conditional \"CPPCHECK\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by psensor $as_me 1.0.2, which was
+This file was extended by psensor $as_me 1.1.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-psensor config.status 1.0.2
+psensor config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
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
# 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.
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" ||
case "$ac_file" in */Makefile.in)
# Adjust a relative srcdir.
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
+ ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
# In autoconf-2.13 it is called $ac_given_srcdir.
# In autoconf-2.50 it is called $srcdir.
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
rm -f "$ac_dir/POTFILES"
test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- gt_tab=`printf '\t'`
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+ cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
POMAKEFILEDEPS="POTFILES.in"
# ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
# on $ac_dir but don't depend on user-specified configuration
test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
fi
ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ # Hide the ALL_LINGUAS assigment from automake < 1.5.
eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi
# Compute POFILES
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.69])
-AC_INIT([psensor], [1.0.2],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [1.1.1],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
AM_INIT_AUTOMAKE([-Wall gnu])
AM_GNU_GETTEXT_VERSION([0.16])
AM_GNU_GETTEXT([external])
-# Gconf
-AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
-AM_GCONF_SOURCE_2
+# Gsettings
+GLIB_GSETTINGS
############### common
# Checks sensors, required by psensor and psensor-server
AC_CHECK_LIB(sensors, sensors_init)
-AC_CHECK_HEADERS([sensors/sensors.h sensors/errors.h])
+AC_CHECK_HEADERS([sensors/sensors.h sensors/error.h])
SENSORS_LIBS=-lsensors
AC_SUBST(SENSORS_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-# Check GCONF
-PKG_CHECK_MODULES(GCONF, gconf-2.0,
- [AC_DEFINE([HAVE_GCONF2],[1],[Use gconf2])],
- [AC_MSG_WARN("gconf2 missing psensor will not be built")])
-AM_CONDITIONAL(GCONF, test -n "$GCONF_LIBS")
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-
### Optional
# check libatasmart
# Check JSON, needed for remote monitoring
JSON_LIBS=
PKG_CHECK_MODULES(JSON,
- json-c,
+ json-c >= 0.11.99,
[AC_DEFINE([HAVE_JSON],[1],[Use JSON])],
[AC_MSG_WARN("json-c missing")])
if test "$JSON_LIBS" == ""; then
PKG_CHECK_MODULES(JSON,
- json,
+ json >= 0.11.99,
[AC_DEFINE([HAVE_JSON],[1],[Use JSON])
AC_DEFINE([HAVE_JSON_0],[1],[Use JSON0])],
[AC_MSG_WARN("json0 missing")])
AC_CHECK_PROGS([HELP2MAN], [help2man])
+AC_CHECK_PROG([ASCIIDOC], [asciidoc], yes)
+AM_CONDITIONAL(ASCIIDOC, test -n "$ASCIIDOC")
+
AC_CHECK_PROG(HAVE_CPPCHECK, cppcheck, yes)
AM_CONDITIONAL(CPPCHECK, test -n "$HAVE_CPPCHECK")
-psensor (1.0.2.x-1) saucy; urgency=low
- * New upstream release.
+psensor (1.1.1-1ppatrusty1) trusty; urgency=medium
- -- Jean-Philippe Orsini <jeanfi@gmail.com> Tue, 3 Jun 2014 11:54:21 +0200
+ * New upstream release.
+ * debian/psensor.install
+ + removed gconf schema.
+ * debian/control
+ + removed build dep to gconf which is no more needed.
+
+ -- Jean-Philippe Orsini <jeanfi@gmail.com> Mon, 01 Sep 2014 17:50:19 +0200
-psensor (1.0.2-1ppatrusty1) trusty; urgency=low
+psensor (1.0.4-1) unstable; urgency=medium
- * Bump trusty PPA
+ * New upstream release.
+ + fixed psensor does not start: Attempt to unlock mutex that was not
+ locked during startup with glib 2.41.2. (LP: #1346299)
+ + fixed FTBFS with clang instead of gcc. (Closes: #753061)
+ * debian/control
+ + added build dep to libappindicator3-dev.
+ + switched to optional priority instead of extra.
+ + removed useless dots after long descriptions.
+ * debian/rules
+ + removed useless comments.
+ * debian/copyright
+ + switched to copyright format 1.0.
- -- Jean-Philippe Orsini <jeanfi@gmail.com> Tue, 3 Jun 2014 08:54:21 +0200
+ -- Jean-Philippe Orsini <jeanfi@gmail.com> Wed, 06 Aug 2014 18:36:41 -0400
psensor (1.0.2-1) unstable; urgency=low
Source: psensor
Section: utils
-Priority: extra
+Priority: optional
Maintainer: Jean-Philippe Orsini <jeanfi@gmail.com>
Build-Depends: asciidoc,
autoconf,
-This package was debianized by Jean-Philippe Orsini <jeanfi@gmail.com>
-Tue, 15 Feb 18:33:41 CET 2011.
-
-It was downloaded from: http://wpitchoune.net/psensor
-
-Upstream Author: Jean-Philippe Orsini <jeanfi@gmail.com>
-
-Copyright:
- Copyright (C) 2010-2014 by Jean-Philippe Orsini <jeanfi@gmail.com>
-
-License:
-
- This package 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; version 2 dated June, 1991.
-
- This package 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301, USA.
-
-On Debian/Ubuntu systems, the complete text of the GNU General Public
-License can be found in `/usr/share/common-licenses/GPL-2'.
-
-Packaging:
- Copyright (C) 2010-2014 by Jean-Philippe Orsini <jeanfi@gmail.com>
- released under GNU General Public License version 2.
-
-
-The following files are distributed under their own terms:
-
-www/{jqplot.css,jqplot.dateAxisRenderer.js,jqplot.js}:
- Copyright (c) 2009-2013 Chris Leonello
- Dual licensed under the MIT and GNU General Public License version 2
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: psensor
+Upstream-Contact: Jean-Philippe Orsini <jeanfi@gmail.com>
+Source: http://wpitchoune.net/psensor
+
+Files: *
+Copyright: 2010-2014 Jean-Philippe Orsini <jeanfi@gmail.com>
+License: GPL-2.0
+
+Files: www/jqplot.css www/jqplot.dateAxisRenderer.js www/jqplot.js
+Copyright: 2009-2013 Chris Leonello <chris@jqplot.com>
+License: GPL-2.0 or MIT
+
+Files: www/jquery.js
+Copyright: 2005-2012 jQuery Foundation, Inc. and other contributors
+License: MIT
+
+Files: debian/*
+Copyright: 2010-2014 Jean-Philippe Orsini <jeanfi@gmail.com>
+License: GPL-2.0
+
+License: GPL-2.0
+ This package 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
+ (at your option) any later version.
+ .
+ This package 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 <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
/usr/share/psensor/psensor-pref.glade
/usr/share/psensor/sensor-edit.glade
/usr/share/psensor/psensor.glade
-/usr/share/glib-2.0
\ No newline at end of file
+/usr/share/glib-2.0
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
%:
-dist_doc_DATA = faq.html faq.txt
+dist_doc_DATA = faq.html faq.txt TODO.txt TODO.html
+if ASCIIDOC
faq.html: faq.txt ../www/style.css
- asciidoc --theme style -a themedir=`pwd`/../www -n -a toc faq.txt
\ No newline at end of file
+ asciidoc --theme style -a themedir=`pwd`/../www -n -a toc faq.txt
+
+TODO.html: faq.txt ../www/style.css
+ asciidoc --theme style -a themedir=`pwd`/../www -n -a toc TODO.txt
+endif
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = doc
-DIST_COMMON = $(dist_doc_DATA) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(dist_doc_DATA)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(docdir)"
DATA = $(dist_doc_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-dist_doc_DATA = faq.html faq.txt
+dist_doc_DATA = faq.html faq.txt TODO.txt TODO.html
all: all-am
.SUFFIXES:
@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
-ctags: CTAGS
-CTAGS:
+ctags CTAGS:
+
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-dist_docDATA 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-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-dist_docDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dist_docDATA 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-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-dist_docDATA
+
+@ASCIIDOC_TRUE@faq.html: faq.txt ../www/style.css
+@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/../www -n -a toc faq.txt
-faq.html: faq.txt ../www/style.css
- asciidoc --theme style -a themedir=`pwd`/../www -n -a toc faq.txt
+@ASCIIDOC_TRUE@TODO.html: faq.txt ../www/style.css
+@ASCIIDOC_TRUE@ asciidoc --theme style -a themedir=`pwd`/../www -n -a toc TODO.txt
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- /dev/null
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 8.6.9" />\r
+<title>Psensor TODO</title>\r
+<style type="text/css">\r
+\r
+body {\r
+ background: #e2e2e2;\r
+ color: #333333;\r
+ font-family: Ubuntu,Arial,sans-serif;\r
+ line-height: 1.6;\r
+ font-weight: lighter;\r
+ margin: 1em 2em 2em 2em;\r
+ padding: 0 0 0 0;\r
+}\r
+\r
+h1 {\r
+ font-size: 2.813em;\r
+ margin: 0 0 0.267em 0;\r
+ padding: 0 0 0 0;\r
+ font-weight: normal;\r
+}\r
+\r
+h2 {\r
+ font-size: 2em;\r
+ margin: 0 0 0.375em;\r
+ padding: 0 0 0 0;\r
+ font-weight: normal;\r
+}\r
+\r
+h3 {\r
+ font-size: 1.438em;\r
+ margin: 0 0 0.522em;\r
+ padding: 0 0 0 0;\r
+ font-weight: normal;\r
+}\r
+\r
+h4 {\r
+ font-size: 1.219em;\r
+ margin: 0 0 0.615em;\r
+ padding: 0 0 0 0;\r
+ font-weight: normal;\r
+}\r
+\r
+h5 {\r
+ font-size: 1em;\r
+ margin: 0 0 0.75em;\r
+ padding: 0 0 0 0;\r
+ font-weight: bold;\r
+}\r
+\r
+h6 {\r
+ font-weight: normal;\r
+ font-size: 0.813em;\r
+ letter-spacing: 0.1em;\r
+ margin: 0 0 0.923em;\r
+ text-transform: uppercase;\r
+ padding: 0 0 0 0;\r
+}\r
+\r
+li {\r
+ margin: 0 0 0 1em;\r
+ line-height: 1.6;\r
+}\r
+\r
+li p {\r
+ margin: 0 0 0 0;\r
+}\r
+\r
+ul {\r
+ margin: 0 0 0 0;\r
+ padding: 0 0 0 0;\r
+}\r
+\r
+a:link, a:visited {\r
+ color: #19B6EE;\r
+ text-decoration: none;\r
+}\r
+\r
+a:hover {\r
+ text-decoration: underline;\r
+}\r
+\r
+code, pre, tt {\r
+ font-family: "Ubuntu Mono","Courier New",Courier,monospace;\r
+ font-weight: normal;\r
+ color: #333333;\r
+}\r
+\r
+pre {\r
+ background: none repeat scroll 0 0 #e0e0e0;\r
+ border-radius: 4px;\r
+ padding: 0.5em 0.5em;\r
+ margin: 0 0 0 0;\r
+ white-space: pre-wrap;\r
+ word-wrap: break-word;\r
+}\r
+\r
+table {\r
+ width: 100%;\r
+ text-align: left;\r
+}\r
+\r
+#footer {\r
+ margin: 0 0 0 0;\r
+ font-size: 0.8em;\r
+ font-weight: lighter;\r
+ clear: both;\r
+ text-align: right;\r
+}\r
+\r
+#page {\r
+ margin: 0 0 0 0;\r
+ padding: 0 0 0 0;\r
+}\r
+\r
+#main {\r
+ background: #ffffff;\r
+\r
+ -moz-box-sizing: border-box;\r
+\r
+ padding: 2em 2em 2em 2em;\r
+\r
+ -moz-border-radius: 4px;\r
+ -webkit-border-radius: 4px;\r
+ border-radius: 4px;\r
+\r
+ -webkit-box-shadow: 0 2px 2px 0 #C2C2C2;\r
+ box-shadow: 0 2px 2px 0 #C2C2C2;\r
+}\r
+\r
+#menu {\r
+ background: #ffffff;\r
+ -moz-box-sizing: border-box;\r
+ padding: 2em 2em 2em 2em;\r
+\r
+ -moz-border-radius: 4px;\r
+ -webkit-border-radius: 4px;\r
+ border-radius: 4px;\r
+\r
+ -webkit-box-shadow: 0 2px 2px 0 #C2C2C2;\r
+ box-shadow: 0 2px 2px 0 #C2C2C2;\r
+}\r
+\r
+#menu-list, #menu-list > li > ul {\r
+ list-style-type: none;\r
+}\r
+\r
+/* menu on left col, content on right col */\r
+\r
+#menu {\r
+ float: left;\r
+ width: 18%;\r
+}\r
+\r
+#main {\r
+ float: right;\r
+ width: 80%;\r
+}\r
+\r
+/* asciidoc */\r
+\r
+#toc, #content {\r
+ margin: 0em 0em 2em 0em;\r
+\r
+ background: #ffffff;\r
+ -moz-box-sizing: border-box;\r
+ padding: 2em 2em 2em 2em;\r
+\r
+ -moz-border-radius: 4px;\r
+ -webkit-border-radius: 4px;\r
+ border-radius: 4px;\r
+\r
+ -webkit-box-shadow: 0 2px 2px 0 #C2C2C2;\r
+ box-shadow: 0 2px 2px 0 #C2C2C2;\r
+}\r
+\r
+\r
+</style>\r
+<script type="text/javascript">\r
+/*<+'])');\r
+ // Function that scans the DOM tree for header elements (the DOM2\r
+ // nodeIterator API would be a better technique but not supported by all\r
+ // browsers).\r
+ var iterate = function (el) {\r
+ for (var i = el.firstChild; i != null; i = i.nextSibling) {\r
+ if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {\r
+ var mo = re.exec(i.tagName);\r
+ if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {\r
+ result[result.length] = new TocEntry(i, getText(i), mo[1]-1);\r
+ }\r
+ iterate(i);\r
+ }\r
+ }\r
+ }\r
+ iterate(el);\r
+ return result;\r
+ }\r
+\r
+ var toc = document.getElementById("toc");\r
+ if (!toc) {\r
+ return;\r
+ }\r
+\r
+ // Delete existing TOC entries in case we're reloading the TOC.\r
+ var tocEntriesToRemove = [];\r
+ var i;\r
+ for (i = 0; i < toc.childNodes.length; i++) {\r
+ var entry = toc.childNodes[i];\r
+ if (entry.nodeName.toLowerCase() == 'div'\r
+ && entry.getAttribute("class")\r
+ && entry.getAttribute("class").match(/^toclevel/))\r
+ tocEntriesToRemove.push(entry);\r
+ }\r
+ for (i = 0; i < tocEntriesToRemove.length; i++) {\r
+ toc.removeChild(tocEntriesToRemove[i]);\r
+ }\r
+\r
+ // Rebuild TOC entries.\r
+ var entries = tocEntries(document.getElementById("content"), toclevels);\r
+ for (var i = 0; i < entries.length; ++i) {\r
+ var entry = entries[i];\r
+ if (entry.element.id == "")\r
+ entry.element.id = "_toc_" + i;\r
+ var a = document.createElement("a");\r
+ a.href = "#" + entry.element.id;\r
+ a.appendChild(document.createTextNode(entry.text));\r
+ var div = document.createElement("div");\r
+ div.appendChild(a);\r
+ div.className = "toclevel" + entry.toclevel;\r
+ toc.appendChild(div);\r
+ }\r
+ if (entries.length == 0)\r
+ toc.parentNode.removeChild(toc);\r
+},\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////\r
+// Footnotes generator\r
+/////////////////////////////////////////////////////////////////////\r
+\r
+/* Based on footnote generation code from:\r
+ * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html\r
+ */\r
+\r
+footnotes: function () {\r
+ // Delete existing footnote entries in case we're reloading the footnodes.\r
+ var i;\r
+ var noteholder = document.getElementById("footnotes");\r
+ if (!noteholder) {\r
+ return;\r
+ }\r
+ var entriesToRemove = [];\r
+ for (i = 0; i < noteholder.childNodes.length; i++) {\r
+ var entry = noteholder.childNodes[i];\r
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")\r
+ entriesToRemove.push(entry);\r
+ }\r
+ for (i = 0; i < entriesToRemove.length; i++) {\r
+ noteholder.removeChild(entriesToRemove[i]);\r
+ }\r
+\r
+ // Rebuild footnote entries.\r
+ var cont = document.getElementById("content");\r
+ var spans = cont.getElementsByTagName("span");\r
+ var refs = {};\r
+ var n = 0;\r
+ for (i=0; i<spans.length; i++) {\r
+ if (spans[i].className == "footnote") {\r
+ n++;\r
+ var note = spans[i].getAttribute("data-note");\r
+ if (!note) {\r
+ // Use [\s\S] in place of . so multi-line matches work.\r
+ // Because JavaScript has no s (dotall) regex flag.\r
+ note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];\r
+ spans[i].innerHTML =\r
+ "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +\r
+ "' title='View footnote' class='footnote'>" + n + "</a>]";\r
+ spans[i].setAttribute("data-note", note);\r
+ }\r
+ noteholder.innerHTML +=\r
+ "<div class='footnote' id='_footnote_" + n + "'>" +\r
+ "<a href='#_footnoteref_" + n + "' title='Return to text'>" +\r
+ n + "</a>. " + note + "</div>";\r
+ var id =spans[i].getAttribute("id");\r
+ if (id != null) refs["#"+id] = n;\r
+ }\r
+ }\r
+ if (n == 0)\r
+ noteholder.parentNode.removeChild(noteholder);\r
+ else {\r
+ // Process footnoterefs.\r
+ for (i=0; i<spans.length; i++) {\r
+ if (spans[i].className == "footnoteref") {\r
+ var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");\r
+ href = href.match(/#.*/)[0]; // Because IE return full URL.\r
+ n = refs[href];\r
+ spans[i].innerHTML =\r
+ "[<a href='#_footnote_" + n +\r
+ "' title='View footnote' class='footnote'>" + n + "</a>]";\r
+ }\r
+ }\r
+ }\r
+},\r
+\r
+install: function(toclevels) {\r
+ var timerId;\r
+\r
+ function reinstall() {\r
+ asciidoc.footnotes();\r
+ if (toclevels) {\r
+ asciidoc.toc(toclevels);\r
+ }\r
+ }\r
+\r
+ function reinstallAndRemoveTimer() {\r
+ clearInterval(timerId);\r
+ reinstall();\r
+ }\r
+\r
+ timerId = setInterval(reinstall, 500);\r
+ if (document.addEventListener)\r
+ document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);\r
+ else\r
+ window.onload = reinstallAndRemoveTimer;\r
+}\r
+\r
+}\r
+asciidoc.install(2);\r
+/*]]>*/\r
+</script>\r
+</head>\r
+<body class="article">\r
+<div id="header">\r
+<h1>Psensor TODO</h1>\r
+<div id="toc">
+ <div id="toctitle">Table of Contents</div>
+ <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
+</div>\r
+</div>\r
+<div id="content">\r
+<div id="preamble">\r
+<div class="sectionbody">\r
+<div class="paragraph"><p>The last version of this file is available at\r
+<a href="http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/TODO.html;hb=HEAD">http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/TODO.html;hb=HEAD</a>.</p></div>\r
+<div class="ulist"><ul>\r
+<li>\r
+<p>\r
+Play a sound when a sensor alert is raised. Note that\r
+ it can actually be done by using the script support.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Use max/crit temperature information provided by\r
+ lm-sensor.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Include help/faq directly in psensor UI.\r
+</p>\r
+</li>\r
+</ul></div>\r
+</div>\r
+</div>\r
+</div>\r
+<div id="footnotes"><hr /></div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 2014-08-22 01:05:26 CEST\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r
--- /dev/null
+Psensor TODO
+============
+
+The last version of this file is available at
+http://wpitchoune.net/gitweb/?p=psensor.git;a=blob_plain;f=doc/TODO.html;hb=HEAD.
+
+ * Play a sound when a sensor alert is raised. Note that
+ it can actually be done by using the script support.
+
+ * Use max/crit temperature information provided by
+ lm-sensor.
+
+ * Include help/faq directly in psensor UI.
<div class="ulist"><ul>\r
<li>\r
<p>\r
-<a href="mailto:psensor-users@googlegroups.com">psensor-users@googlegroups.com</a> (require registration at:\r
- <a href="https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users">https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users</a>)\r
+<a href="mailto:psensor-users@googlegroups.com">psensor-users@googlegroups.com</a>\r
</p>\r
</li>\r
<li>\r
<div class="sectionbody">\r
<div class="paragraph"><p>Check the FAQ or the TODO pages.</p></div>\r
<div class="paragraph"><p>If you don’t find the information, you can send an email to the public\r
-mailing-list <a href="mailto:psensor-users@googlegroups.com">psensor-users@googlegroups.com</a> (require registration at:\r
-<a href="https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users">https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users</a>)\r
-or send an email directly to me: <a href="mailto:jeanfi@gmail.com">jeanfi@gmail.com</a>.</p></div>\r
+mailing-list <a href="mailto:psensor-users@googlegroups.com">psensor-users@googlegroups.com</a> or directly to me:\r
+<a href="mailto:jeanfi@gmail.com">jeanfi@gmail.com</a>.</p></div>\r
</div>\r
</div>\r
<div class="sect1">\r
<div class="content">\r
<pre><code>root 1433 1 0 May28 ? 00:00:21 /usr/sbin/hddtemp -d -l 127.0.0.1 -p 7634 -s | /dev/sdb</code></pre>\r
</div></div>\r
-<div class="paragraph"><p>Since recent Ubuntu releases, installing the <code>hddtemp</code> package is not\r
-enough, it is required to manually allow the <code>hddtemp</code> daemon. Edit the\r
-file <code>/etc/default/hddtemp</code> and set <code>RUN_DAEMON</code> to <code>"true"</code>.</p></div>\r
+<div class="paragraph"><p>Depending on the Linux distribution, the installation of the <code>hddtemp</code>\r
+package does not enable the hddtemp daemon automaticaly.</p></div>\r
+<div class="paragraph"><p>In this case, edit the file <code>/etc/default/hddtemp</code> and set\r
+<code>RUN_DAEMON</code> to <code>"true"</code> like in the following example:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><code># hddtemp network daemon switch. If set to true, hddtemp will listen\r
# for incoming connections.\r
RUN_DAEMON="true"</code></pre>\r
</div></div>\r
+<div class="paragraph"><p>For Debian/Ubuntu, you can use</p></div>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><code>dpkg-reconfigure hddtemp</code></pre>\r
+</div></div>\r
+<div class="paragraph"><p>and reply <code>yes</code> when asked whether hddtemp daemon must be\r
+run during the startup.</p></div>\r
</div>\r
</div>\r
<div class="sect1">\r
</ul></div>\r
</div>\r
</div>\r
+<div class="sect1">\r
+<h2 id="S_HideSensor">18. Is it possible to hide sensors in the main window?</h2>\r
+<div class="sectionbody">\r
+<div class="paragraph"><p>Before v1.1.1, the sensors retrieved from the lm-sensor library can be\r
+ignored directly in the lm-sensor configuration. See the manpage\r
+of sensors.conf(5).</p></div>\r
+<div class="paragraph"><p>Since v1.1.1, it is possible to hide a sensor, uncheck the setting\r
+<em>Display sensor in the list of sensors</em> in the sensor preferences.</p></div>\r
+</div>\r
+</div>\r
</div>\r
<div id="footnotes"><hr /></div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2014-06-02 09:02:02 CEST\r
+Last updated 2014-08-22 01:10:27 CEST\r
</div>\r
</div>\r
</body>\r
If you don’t want to use the launchpad, you can send the report by
email to:
- - psensor-users@googlegroups.com (require registration at:
- https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users)
+ - psensor-users@googlegroups.com
- or jeanfi@gmail.com.
If the bug is concerning Debian or Ubuntu derivatives distribution,
Check the FAQ or the TODO pages.
If you don’t find the information, you can send an email to the public
-mailing-list psensor-users@googlegroups.com (require registration at:
-https://groups.google.com/forum/?fromgroups&hl=en#!forum/psensor-users)
-or send an email directly to me: jeanfi@gmail.com.
+mailing-list psensor-users@googlegroups.com or directly to me:
+jeanfi@gmail.com.
[[S_Contribute]]
root 1433 1 0 May28 ? 00:00:21 /usr/sbin/hddtemp -d -l 127.0.0.1 -p 7634 -s | /dev/sdb
---------------------
-Since recent Ubuntu releases, installing the +hddtemp+ package is not
-enough, it is required to manually allow the +hddtemp+ daemon. Edit the
-file +/etc/default/hddtemp+ and set +RUN_DAEMON+ to +"true"+.
+Depending on the Linux distribution, the installation of the +hddtemp+
+package does not enable the hddtemp daemon automaticaly.
+
+In this case, edit the file +/etc/default/hddtemp+ and set
++RUN_DAEMON+ to +"true"+ like in the following example:
------------------
# hddtemp network daemon switch. If set to true, hddtemp will listen
RUN_DAEMON="true"
------------------
+For Debian/Ubuntu, you can use
+------------------
+dpkg-reconfigure hddtemp
+------------------
+
+and reply +yes+ when asked whether hddtemp daemon must be
+run during the startup.
[[S_SimilarSoft]]
Is there any other similar softwares?
- more general, but can be configured to display sensors
information: http://conky.sourceforge.net/
+
+[[S_HideSensor]]
+Is it possible to hide sensors in the main window?
+--------------------------------------------------
+
+Before v1.1.1, the sensors retrieved from the lm-sensor library can be
+ignored directly in the lm-sensor configuration. See the manpage
+of sensors.conf(5).
+
+Since v1.1.1, it is possible to hide a sensor, uncheck the setting
+'Display sensor in the list of sensors' in the sensor preferences.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/14x14
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/16x16
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/22x22
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/24x24
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/32x32
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/48x48
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/64x64
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/hicolor/scalable
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/ubuntu-mono-dark/apps/22
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/ubuntu-mono-dark/status/22
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = icons/ubuntu-mono-light/status/22
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(psensordistpixdir)"
DATA = $(psensordistpix_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(psensordistpix_DATA)'; test -n "$(psensordistpixdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(psensordistpixdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-psensordistpixDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-psensordistpixDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-psensordistpixDATA \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-psensordistpixDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
+src/cfg.c
src/glade/psensor.glade
src/glade/psensor-pref.glade
src/glade/sensor-edit.glade
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2014-04-30 16:48+0100\n"
"Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
"Language-Team: German\n"
"X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n"
"X-Generator: Poedit 1.5.4\n"
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Erzeugen des Webservers ist gescheitert."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert."
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Info"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Einstellungen"
msgid "Show"
msgstr "Anzeigen"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor – Temperaturüberwachung"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Hilfe"
msgstr "Messungen"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Graph"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "N/V"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+msgid "Display sensor in the list of sensors"
+msgstr ""
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: ADL-Bibliothek konnte nicht gefunden werden."
msgid "Failed to retrieve NVIDIA information."
msgstr "Ermittlung der NVIDIA-Informationen gescheitert."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "U/min"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "HOME-Variable ist nicht festgelegt."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Sensorprotokolldatei ist bereits geöffnet."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Sensorprotokolldatei kann nicht geöffnet werden: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Sensorprotokolldatei ist nicht geöffnet."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr ""
"Sensorprotokolldatei ist nicht geöffnet und kann deswegen nicht geschlossen "
"werden."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"weiterverbreiten.\n"
"Sie wird OHNE JEGLICHE GEWÄHRLEISTUNG zur Verfügung gestellt.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Aufruf: %s [OPTION] …\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor ist eine GTK+-Anwendung zur Überwachung von Hardware-Sensoren, "
"inklusive Temperaturen und Lüftergeschwindigkeiten."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Optionen:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help Diese Hilfe anzeigen und beenden\n"
" -v, --version Versionsinformationen anzeigen und beenden"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL Die Adresse (URL) von psensor-server,\n"
" Beispiel: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --use-libatasmart atasmart-Bibliothek zur Festplattenüberwachung\n"
" anstelle des hddtemp-Dienstes nutzen"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
" -n, --new-instance Erzeugung einer neuen Psensor-Anwendung erzwingen"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=STUFE Fehlerdiagnosestufe festlegen, Ganzzahl zwischen 0 und "
"3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Programmfehler melden an: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s-Website: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor wurde ohne Unterstützung für entfernte Sensoren kompiliert."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Fehlerdiagnosemodus wird aktiviert."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Rufen Sie »%s --help« auf, um weitere Informationen zu erhalten.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Es existiert bereits eine Psensor-Instanz."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Erzeugen des Webservers ist gescheitert."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Ungültiges JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>Anhalten des Servers angefordert</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Seite nicht gefunden – Gehen Sie zurück zur <a "
"href='/'>Startseite</a></p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server ist ein HTTP-Server zur Fernüberwachung von Hardware-Sensoren."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tDiese Hilfe anzeigen und beenden\n"
" -v, --version\t\tVersionsinformationen anzeigen und beenden"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\tWebserver-Port\n"
" -w,--wdir=DIR\t\tOrdner, der Webserver-Seiten enthält"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL Fehlerdiagnoseebene festlegen, Ganzzahl zwischen 0 "
"und 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH Protokolldatei auf PATH festlegen"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr " --sensor-log-file=PATH Sensorenprotokolldatei auf PATH festlegen"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S Sensorenprotokollierungsintervall auf S (Sekunden) "
"festlegen"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP Abfrage: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Aktiviert den Fehlerdiagnosemodus: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Keine Sensoren erkannt."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Erzeugen des Webservers ist gescheitert."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Web-Server wurde gestartet auf Port: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW-Ordner: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "Adresse: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Aktivieren der Sensorenprotokollierung ist gescheitert."
msgid "Psensor Homepage"
msgstr "Psensor-Website"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Laden des Psensor-Symbols ist gescheitert."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Wählen Sie eine Vordergrundfarbe"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Sensor"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Wert"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Min."
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Max."
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Farbe"
msgid "Fan alert"
msgstr "Lüfteralarm"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Unbekannt"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2013-05-12 22:16+0000\n"
"Last-Translator: Javier <buik8roadmaster@hotmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
"X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
"X-Generator: Launchpad (build 16799)\n"
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Fallo al crear el servidor Web"
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Error al activar el registro de sensores"
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Acerca de"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Ajustes"
msgid "Show"
msgstr "Mostrar"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - Monitor de temperatura"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Ayuda"
msgstr "Medidas"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Gráfica"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "No disponible"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Mostrar sensor en el menú de aplicaciones"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: no se ha encontrado la librería ADL"
msgid "Failed to retrieve NVIDIA information."
msgstr "Error al obtener la información de NVIDIA"
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "La variable HOME no ha sido definida"
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Ya existe un registro de sensores abierto"
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "No se puede abrir el archivo de registro: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "No se abrió el archivo de registro."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "¡No existe archivo que cerrar!"
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"apoyada por el autor. \n"
"No existe NINGUNA GARANTÍA hasta donde la ley lo permita.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPTION]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor es un programa GTK+ que muestra datos de temperatura y ventiladores "
"a través de los sensores de su hardware."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Opciones"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help Muestra esta ayuda. \n"
" -v, --versión Muestra información sobre la versión."
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL La URL del servidor psensor,\n"
" ejemplo: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --usar-libatasmart usar librería atasmart para leer el sensor del disco\n"
" duro en lugar de hddtemp daemon"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr " -n, --new-instance Fuerza el inicio de otro Psensor paralelo"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=NIVEL Establece el nivel de depuración con un valor entre 0 "
"y 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Comunicar fallos: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s Página Oficial: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor no ha sido compilado con soporte para sensores remotos."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Activa el modo de depuración"
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Introducir `%s --ayuda' para obtener más información\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Ya existe un Psensor en ejecución."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Fallo al crear el servidor Web"
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "JSON no válido:%s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>El servidor solicitó detenerse</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Página no encontrada- Ir a <a href='/'>Página Principal</a></"
"p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server es un servidor HTTP para obtener información de los sensores "
"de forma remota."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tMuestra esta ayuda.\n"
" -v, --version\t\tMuestra la versión."
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\tPuerto del servidor web. \n"
" -w,--wdir=DIR\t\tDirectorio de servidores web."
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=NIVEL Establece el nivel de depuración con un número de 0 "
"a 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH establece el archivo de registro en PATH"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr " --sensor-log-file=PATH establecer el archivo de registro en PATH"
-#: src/server/server.c:113
+#: src/server/server.c:114
#, fuzzy
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr " --sensor-log-interval=S registrar sensores cada S (seconds)"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "Petición HTTP:%s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Activa el modo de depuración:%d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "No se han detectado sensores."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Fallo al crear el servidor Web"
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Servidor web iniciado en el puerto:%d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "directorio WWW:%s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Error al activar el registro de sensores"
msgid "Psensor Homepage"
msgstr "Web de Psensor"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Error al cargar el icono de Psensor"
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Seleccionar el color del primer plano"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Sensor"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Valor"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Mín"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Máx"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Color"
msgid "Fan alert"
msgstr "Alarma por parada de ventilador."
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Desconocido"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2013-06-29 15:14+0000\n"
"Last-Translator: londumas <helion331990@gmail.com>\n"
"Language-Team: French <>\n"
"X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
"X-Generator: Launchpad (build 16799)\n"
+#: src/cfg.c:494
+#, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr ""
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Échec de l'activation de la journalisation des capteurs."
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "À propos"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Préférences"
msgid "Show"
msgstr "Afficher"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - Surveillance des températures"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr ""
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Aide"
msgstr "Mesures"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Graphe"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "N/A"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Afficher le capteur dans le menu"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD : impossible de trouver la bibliothèque ADL."
msgid "Failed to retrieve NVIDIA information."
msgstr "Échec de la récupération des information NVIDIA."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "Tr/mn"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "Variable home non définie."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Le journal des capteurs est déjà ouvert."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Ne peut ouvrir le journal : %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Le journal des capteurs n'est pas ouvert."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Le journal des capteurs n'est pas ouvert, il ne peut être fermé."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"Ce logiciel n'est accompagné d'ABSOLUMENT AUCUNE GARANTIE, dans les limites\n"
"autorisées par la loi.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Utilisation : %s [OPTION]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor est une application GTK+ pour surveiller les capteurs thermiques et "
"les vitesses de ventilateurs."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Options :"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help afficher cette aide et quitter\n"
" -v, --version afficher les informations de version et quitter"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
msgstr ""
" -u, --url=URL l'URL de psensor-server, example: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --use-libatasmart utiliser la librairie atasmart pour la surveillance\n"
" des disks a la place du serveur hddtemp"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
" -n, --new-instance forcer la création d'une nouvelle occurrence de "
"l'application Psensor"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL assigner le niveau de débogage, nombre entier entre 0 "
"et 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Signaler les bogues à: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s page d’accueil: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr ""
"Psensor n'a pas été compilé avec le support de surveillance à distance."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Active le mode de débogage."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Essayez « %s --help » pour plus d'informations.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Une instance de Psensor existe déjà."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Échec de la création du serveur Web."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "JSON invalide : %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>L’arrêt du serveur a été demandé</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Page introuvable - Allez à <a href='/'>Main page</a></p></"
"body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server est un serveur HTTP pour surveiller à distance les capteurs "
"matérielles."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tafficher cette aide et quitter\n"
" -v, --version\t\tafficher les informations de version et quitter"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\tport du serveur Web\n"
" -w,--wdir=DIR\t\trépertoire contenant les pages du serveur Web"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL assigne le niveau de débogage, nombre entier entre 0 "
"et 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH assigner le chemin d’accès au journal"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr " --sensor-log-file=PATH assigne le journal du capteur vers PATH"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S assigne l'intervalle de journalisation du capteur "
"à S (secondes)"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "Requête HTTP : %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Activation du mode de déboguage: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Aucun capteur détecté."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Échec de la création du serveur Web."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Le serveur Web a été démarré sur le port: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW répertoire : %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Échec de l'activation de la journalisation des capteurs."
msgid "Psensor Homepage"
msgstr "Site internet de Psensor"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Échec du chargement de l’icône de Psensor."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Sélectionner la couleur d'avant-plan"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Capteur"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Valeur"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Min"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Max"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Couleur"
msgid "Fan alert"
msgstr "Alerte ventilateur"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Inconnu"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
-"PO-Revision-Date: 2012-10-29 09:41+0000\n"
-"Last-Translator: Bence Lukács <Unknown>\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
+"PO-Revision-Date: 2014-08-21 11:43+0000\n"
+"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
"Language-Team: Hungarian <gnome-hu-list-request@gnome.org>\n"
"Language: hu\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-21 09:32+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n"
+"X-Generator: Launchpad (build 17174)\n"
+
+#: src/cfg.c:494
+#, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Nem sikerült a mappa létrehozása: %s - %s"
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr "A konfigurációs fájl nem létezik."
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr "Nem sikerült a konfigurációs fájlt beolvasni: %s"
+
+#: src/cfg.c:569
+#, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Nem sikerült a konfigurációs fájlt elmenteni: %s"
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Névjegy"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Beállítások"
msgid "Show"
msgstr "Megjelenítés"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - hőmérsékletfigyelő"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
-msgstr ""
+msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Súgó"
#: src/glade/psensor-pref.glade:24
msgctxt "psensor"
msgid "Right"
-msgstr ""
+msgstr "Jobbra"
#: src/glade/psensor-pref.glade:27
msgid "Left"
#: src/glade/psensor-pref.glade:30
msgid "Top"
-msgstr "Tetejére"
+msgstr "Felül"
#: src/glade/psensor-pref.glade:33
msgid "Bottom"
-msgstr "Aljára"
+msgstr "Alul"
#: src/glade/psensor-pref.glade:60
msgid "Edit Preferences"
#: src/glade/psensor-pref.glade:209
msgid "Celsius"
-msgstr ""
+msgstr "Celsius"
#: src/glade/psensor-pref.glade:210
msgid "Fahrenheit"
-msgstr ""
+msgstr "Fahrenheit"
#: src/glade/psensor-pref.glade:254
msgid "Temperature unit:"
#: src/glade/psensor-pref.glade:299
msgid "Launch on session startup"
-msgstr ""
+msgstr "Indítás a munkamenettel"
#: src/glade/psensor-pref.glade:320
msgid "Hide window on startup"
#: src/glade/psensor-pref.glade:367
msgid "Startup"
-msgstr ""
+msgstr "Indítás"
#: src/glade/psensor-pref.glade:405
msgid "Foreground:"
#: src/glade/psensor-pref.glade:602 src/glade/psensor-pref.glade:752
msgid "second(s)"
-msgstr "s"
+msgstr "másodperc"
#: src/glade/psensor-pref.glade:637
msgid "Update interval:"
msgstr "Mérések"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Grafikon"
#: src/glade/psensor-pref.glade:827
msgid "seconds(s)"
-msgstr "másodperc(ek)"
+msgstr "másodperc"
#: src/glade/psensor-pref.glade:844
msgid "Script executed when an alarm is raised:"
-msgstr ""
+msgstr "Parancsfájl futtatás riasztáskor:"
#: src/glade/psensor-pref.glade:877
msgid "Sensors"
#: src/glade/sensor-edit.glade:96
msgid "Name"
-msgstr ""
+msgstr "Név"
#: src/glade/sensor-edit.glade:140
msgid "Type:"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "---"
#: src/glade/sensor-edit.glade:232
msgid "Id:"
-msgstr "Id:"
+msgstr "Azonosító:"
#: src/glade/sensor-edit.glade:278
msgid "Draw sensor curve"
#: src/glade/sensor-edit.glade:397
msgid "Application Indicator"
-msgstr ""
+msgstr "Alkalmazás Indikátor"
#: src/glade/sensor-edit.glade:411
msgid "Display sensor in the menu"
#: src/glade/sensor-edit.glade:429
#, fuzzy
msgid "Display sensor in the label (experimental)"
-msgstr "Érzékelők megjelenítése az alkalmazásmenüben"
+msgstr "Érzékelők megjelenítése a címkén (fejlesztés alatt)"
#: src/glade/sensor-edit.glade:500
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Érzékelő megjelenítése az érzékelők listáján"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: Nem sikerült betölteni az ADL programkönyvtárat."
#: src/lib/amd.c:250
#, c-format
msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgstr "ADM/ATI adapterek száma: %d"
#: src/lib/amd.c:251
#, c-format
msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgstr "Aktív ADM/ATI adapterek száma: %d"
#: src/lib/cpu.c:46
msgid "CPU"
-msgstr ""
+msgstr "Processzor"
#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
msgid "Disk"
-msgstr ""
+msgstr "Lemez"
#: src/lib/hdd_atasmart.c:152
#, c-format
#: src/lib/lmsensor.c:148
msgid "Intel CPU"
-msgstr ""
+msgstr "Intel processzor"
#: src/lib/lmsensor.c:152
msgid "AMD CPU"
-msgstr ""
+msgstr "AMD processzor"
#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
msgid "NVIDIA GPU"
-msgstr ""
+msgstr "NVIDIA videokártya"
#: src/lib/lmsensor.c:156
msgid "VIA CPU"
-msgstr ""
+msgstr "VIA processzor"
#: src/lib/lmsensor.c:218
#, c-format
msgid ""
"NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
msgstr ""
+"Az NVIDIA zár eszközmeghajtó nincs használatban vagy csak nem sikerült a "
+"videokártya hőmérsékletének lekérése."
#: src/lib/nvidia.c:95
msgid "Cannot open connection to X11 server."
msgid "Failed to retrieve NVIDIA information."
msgstr "NVIDIA információinak lekérése meghiúsult."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "HOME változó nincs beállítva."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Az érzékelő naplófájlja már meg van nyitva."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "%s érzékelő naplófájlját nem lehet megnyitni"
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Az érzékelő naplófájlja nincs nyitva."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Az érzékelő naplófájlja nincs nyitva, nem lehet bezárni."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"Ez egy szabad szoftver: szabadon terjesztheti és/vagy módosíthatja\n"
"NINCS GARANCIA, a jogszabályok által megengedett mértékben.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Használat: %s [KAPCSOLÓK]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"A Psensor egy GTK+ alkalmazás a hardver érzékelőinek figyelésére, beleértve "
"a hőmérsékleteket és a ventilátor sebességét."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Kapcsolók:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help ezen súgó megjelenítése, majd kilépés\n"
" -v, --version verzióinformációk megjelenítése, majd kilépés"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL a psensor-server URL-címe,\n"
" például: http://gepnev:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
"figyelésére a\n"
" hddtemp démon helyett"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr " -n, --new-instance új Psensor alkalmazás indításának kényszerítése"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL hibakeresési szint beállítása, egész 0 és 3 között"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "A talált hibákat itt jelentse be: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s honlap: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "A Psensor távoli érzékelők támogatása nélkül lett lefordítva."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Hibakeresési mód engedélyezése."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "További információkért adja ki a „%s --help” parancsot.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "A Psensors egy példánya már létezik."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Nem sikerült a mappa létrehozása: %s - %s"
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Érvénytelen JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>A kiszolgáló leállítást kért</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Az oldal nem található - Ugrás a <a href='/'>Főoldalra</a></"
"p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"A psensor-server egy HTTP kiszolgáló a hardver érzékelőinek figyelésére "
"távolról."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tezen súgó megjelenítése, majd kilépés\n"
" -v, --version\t\tverzióinformáció megjelenítése, majd kilépés"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\twebkiszolgáló portja\n"
" -w,--wdir=DIR\t\ta webkiszolgáló oldalait tartalmazó mappa"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL hibakeresési szint beállítása, egész 0 és 3 között"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=ÚTVONAL a naplófájl ÚTVONALÁNAK beállítása"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
" --sensor-log-file=ÚTVONAL érzékelők naplójának beállítása az ÚTVONALRA"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S érzékelő naplózási gyakoriságának beállítása S "
"másodpercre"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP-kérés: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Hibakeresési mód engedélyezése: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Nem találhatók érzékelők."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Nem sikerült létrehozni a webkiszolgálót."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "A webkiszolgáló elindult ezen a porton: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW könyvtár: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Érzékelők naplózásának aktiválása meghiúsult."
msgid "Psensor Homepage"
msgstr "A Psensor honlapja"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
-msgstr "Nem sikerült betölteni a Psensor ikont."
+msgstr "Nem sikerült betölteni a Psensor ikonját."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Előtérszín kiválasztása"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Érzékelő"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Érték"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Minimum"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Maximum"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Szín"
msgid "Fan alert"
msgstr "Ventilátor riasztás"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Ismeretlen"
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
-"PO-Revision-Date: 2013-04-14 16:06+0000\n"
-"Last-Translator: Diego Pierotto <Unknown>\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
+"PO-Revision-Date: 2014-08-15 21:05+0000\n"
+"Last-Translator: Gabriele <deepdown23@gmail.com>\n"
"Language-Team: Italian\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-04-20 08:36+0000\n"
-"X-Generator: Launchpad (build 16567)\n"
+"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n"
+"X-Generator: Launchpad (build 17174)\n"
+
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Impossibile creare il Web server."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Attivazione registro dei sensori fallita."
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Informazioni su..."
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Preferenze"
#: src/glade/psensor.glade:15 src/glade/psensor.glade:16
#: src/glade/psensor.glade:28
msgid "Sensor Preferences"
-msgstr "Sensor Preferenze"
+msgstr "Preferenze Sensore"
#: src/glade/psensor.glade:24
msgid "Quit"
msgid "Show"
msgstr "Mostra"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - Monitor temperatura"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Aiuto"
#: src/glade/psensor-pref.glade:24
msgctxt "psensor"
msgid "Right"
-msgstr "Diritto"
+msgstr "Destra"
#: src/glade/psensor-pref.glade:27
msgid "Left"
-msgstr "Sinestra"
+msgstr "Sinistra"
#: src/glade/psensor-pref.glade:30
msgid "Top"
-msgstr ""
+msgstr "In Alto"
#: src/glade/psensor-pref.glade:33
msgid "Bottom"
-msgstr ""
+msgstr "In Basso"
#: src/glade/psensor-pref.glade:60
msgid "Edit Preferences"
#: src/glade/psensor-pref.glade:209
msgid "Celsius"
-msgstr ""
+msgstr "Celsius"
#: src/glade/psensor-pref.glade:210
msgid "Fahrenheit"
-msgstr ""
+msgstr "Fahrenheit"
#: src/glade/psensor-pref.glade:254
msgid "Temperature unit:"
#: src/glade/psensor-pref.glade:299
msgid "Launch on session startup"
-msgstr ""
+msgstr "Lancia all'avvio"
#: src/glade/psensor-pref.glade:320
msgid "Hide window on startup"
msgstr "Misure"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Grafico"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "N/A"
#: src/glade/sensor-edit.glade:500
msgid "-1"
-msgstr ""
+msgstr "-1"
+
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Mostra sensore nel menu"
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
#: src/lib/cpu.c:46
msgid "CPU"
-msgstr ""
+msgstr "CPU"
#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
msgid "Disk"
-msgstr ""
+msgstr "Disco"
#: src/lib/hdd_atasmart.c:152
#, c-format
#: src/lib/lmsensor.c:148
msgid "Intel CPU"
-msgstr ""
+msgstr "CPU Intel"
#: src/lib/lmsensor.c:152
msgid "AMD CPU"
-msgstr ""
+msgstr "CPU AMD"
#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
msgid "NVIDIA GPU"
-msgstr ""
+msgstr "CPU NVIDIA"
#: src/lib/lmsensor.c:156
msgid "VIA CPU"
-msgstr ""
+msgstr "CPU VIA"
#: src/lib/lmsensor.c:218
#, c-format
msgid "Failed to retrieve NVIDIA information."
msgstr "Impossibile recuperare informazioni da NVIDIA"
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "Variabile HOME non impostata."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "File di registazione sensori già aperto."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Impossibile aprire il file di registrazione sensori: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "File di registazione sensori non aperto."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Registro sensori non aperto, impossibile chiuderlo."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"Questo è software libero: sei libero di modificarlo e redistribuirlo.\n"
"NON esiste GARANZIA, per gli scopi permessi dalla legge.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPZIONE]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor è un'applicazione GTK+ per monitorare i sensori dell'hardware, "
"incluse temperature e velocità delle ventole."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Opzioni:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help mostra questo help ed esce\n"
" -v, --version mostra le informazioni sulla versione ed esce"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL URL del server psensor,\n"
" esempio: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
"dell'hard disk invece del \n"
" servizio hddtemp"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
" -n, --new-instance forza la creazione di una nuova applicazione Psensor"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL imposta il livello di debug, un intero compreso tra 0 e 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Segnalare i bug a: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s home page: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor è stato compilato senza il supporto per sensori remoti."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Abilita la modalità debug."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Usare '%s --help' per maggiori informazioni.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Esiste già un'istanza di Psensor"
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Impossibile creare il Web server."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "JSON non valido: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>Arresto del server richiesto</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Pagina non trovata - Vai a <a href='/'>Pagina principale</a></"
"p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server è un server HTTP per il monitoraggio remoto di sensori "
"hardware."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tmostra questo help ed esce\n"
" -v, --version\t\tmostra le informazioni sulla versione ed esce"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\tporta del server web\n"
" -w,--wdir=DIR\t\tdirectory che contiene le pagine web"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL imposta il livello di debug, un intero compreso tra 0 e 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH imposta il file di log su PATH"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
" --sensor-log-file=PATH imposta il file di registro dei sensori come PATH"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S imposta l'intervallo del registro di sensori come "
"S (secondi)"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP Request: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Abilita modalità di debug: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Nessun sensore rilevato."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Impossibile creare il Web server."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Web server inizializzato sulla porta: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW directory: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Attivazione registro dei sensori fallita."
msgid "Psensor Homepage"
msgstr "Psensor Homepage"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Impossibile caricare l'icona di Psensor."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Colore di primo piano:"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Sensore"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Valore"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Minimo"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Massimo"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Colore"
msgid "Fan alert"
msgstr "Allarme ventola"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Sconosciuto"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
-"PO-Revision-Date: 2013-10-24 12:32+0000\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
+"PO-Revision-Date: 2014-06-04 22:47+0000\n"
"Last-Translator: tuxmaniack <Unknown>\n"
"Language-Team: Latvian <lv@li.org>\n"
"Language: lv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n"
+"X-Generator: Launchpad (build 17174)\n"
+
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Neizdevās izveidot tīmekļa serveri."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Neizdevās aktivizēt sensoru žurnalēšanu."
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Par"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Iestatījumi"
msgid "Show"
msgstr "Rādīt"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - temperatūras pārraugs"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Palīdzība"
#: src/glade/psensor-pref.glade:24
msgctxt "psensor"
msgid "Right"
-msgstr ""
+msgstr "Pa labi"
#: src/glade/psensor-pref.glade:27
msgid "Left"
-msgstr ""
+msgstr "Pa kreisi"
#: src/glade/psensor-pref.glade:30
msgid "Top"
-msgstr ""
+msgstr "Augšā"
#: src/glade/psensor-pref.glade:33
msgid "Bottom"
-msgstr ""
+msgstr "Lejā"
#: src/glade/psensor-pref.glade:60
msgid "Edit Preferences"
#: src/glade/psensor-pref.glade:209
msgid "Celsius"
-msgstr ""
+msgstr "Celsijs"
#: src/glade/psensor-pref.glade:210
msgid "Fahrenheit"
-msgstr ""
+msgstr "Fārenheits"
#: src/glade/psensor-pref.glade:254
msgid "Temperature unit:"
#: src/glade/psensor-pref.glade:299
msgid "Launch on session startup"
-msgstr ""
+msgstr "Palaist pieteicoties sistēmā"
#: src/glade/psensor-pref.glade:320
msgid "Hide window on startup"
#: src/glade/psensor-pref.glade:367
msgid "Startup"
-msgstr ""
+msgstr "Palaišana"
#: src/glade/psensor-pref.glade:405
msgid "Foreground:"
msgstr "Mērījumi"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Grafiks"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "N/P"
#: src/glade/sensor-edit.glade:429
#, fuzzy
msgid "Display sensor in the label (experimental)"
-msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
+msgstr "Attēlot sensoru etiķetē (eksperimentāls)"
#: src/glade/sensor-edit.glade:500
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Rādīt sensoru aplikāciju indikatora izvēlnē"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: nevar atrast ADL bibliotēku."
#: src/lib/amd.c:250
#, c-format
msgid "Number of AMD/ATI adapters: %d"
-msgstr ""
+msgstr "AMD/ATI adapteru skaits: %d"
#: src/lib/amd.c:251
#, c-format
msgid "Number of active AMD/ATI adapters: %d"
-msgstr ""
+msgstr "Aktīvo AMD/ATI adapteru skaits: %d"
#: src/lib/cpu.c:46
msgid "CPU"
-msgstr ""
+msgstr "CPU"
#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
msgid "Disk"
-msgstr ""
+msgstr "Disks"
#: src/lib/hdd_atasmart.c:152
#, c-format
#: src/lib/lmsensor.c:148
msgid "Intel CPU"
-msgstr ""
+msgstr "Intel CPU"
#: src/lib/lmsensor.c:152
msgid "AMD CPU"
-msgstr ""
+msgstr "AMD CPU"
#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
msgid "NVIDIA GPU"
-msgstr ""
+msgstr "NVIDIA GPU"
#: src/lib/lmsensor.c:156
msgid "VIA CPU"
-msgstr ""
+msgstr "VIA CPU"
#: src/lib/lmsensor.c:218
#, c-format
msgid ""
"NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
msgstr ""
+"NVIDIA īpašniekdraiveris netiek izmantots vai nevar iegūt NVIDIA GPU "
+"temperatūru."
#: src/lib/nvidia.c:95
msgid "Cannot open connection to X11 server."
msgid "Failed to retrieve NVIDIA information."
msgstr "Neizdevās saņemt NVIDIA informāciju."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "HOME mainīgais nav iestatīts."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Sensora žurnāla fails jau ir atvērts."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Nevar atvērt sensora žurnāla failu: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Sensora žurnāla fails nav atvērts."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Sensora žurnāls nav atvērts, nevar aizvērt."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
-msgstr ""
+msgstr "Lietošana: %s [OPCIJAS]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor ir GTK+ lietotne aparatūras sensoru pārraudzībai, ieskaitot "
"temperatūras un ventilatoru ātrumus."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Opcijas:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help rādīt šo palīdzību un iziet\n"
" -v, --version rādīt versijas informāciju un iziet"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=SAITE psensor-server adrese,\n"
" piemērs: http://saimniekdatoravārds:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --use-libatasmart izmantot atasmart bibliotēku disku pārraudzībai\n"
" hddtemp dēmona vietā"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr " -n, --new-instance piespiest izveidot jaunu Psensor lietotni"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr " -d, --debug=LĪMENIS iestatīt atkļūdošanas līmeni, starp 0 un 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Ziņojiet kļūdas uz: %s.\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s mājas lapa: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor nav kompilēts ar attālināto sensoru atbalstu."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Aktivizēt atkļūdošanas režīmu."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Mēģiniet `%s --help', lai iegūtu vairāk informācijas.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Psensor instance jau eksistē."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Neizdevās izveidot tīmekļa serveri."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Nederīgs JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>Servera apturēšana pieprasīta</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Lapa nav atrasta - dodieties uz <a href='/'>galveno lapu</a></"
"p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server ir HTTP serveris aparatūras sensoru attālinātai pārraudzībai."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\trādīt šo palīdzību un iziet\n"
" -v, --version\t\trādīt versijas informāciju un iziet"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORTS\ttīmekļa servera ports\n"
" -w,--wdir=DIR\t\tmape ar tīmekļa servera lapām"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LĪMENIS iestatīt atkļūdošanas līmeni, vesels skaitlis "
"starp 0 un 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=CEĻŠ žurnalēšanas faila ceļš"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr " --sensor-log-file=CEĻŠ sensora žurnāla faila ceļš"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S iestata sensora žurnāla intervālu uz S (sekundēm)"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP pieprasījums: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Aktivizē atkļūdošanas režīmu: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Sensori nav atklāti."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Neizdevās izveidot tīmekļa serveri."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Tīmekļa serveris sākts uz porta: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW mape: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "Saite: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Neizdevās aktivizēt sensoru žurnalēšanu."
msgid "Psensor Homepage"
msgstr "Psensor mājas lapa"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Neizdevās ielādēt Psensor ikonu."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Izvēlieties priekšplāna krāsu"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Sensors"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Vērtība"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Min."
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Maks."
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Krāsa"
msgid "Fan alert"
msgstr "Ventilatora trauksme"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Nezināms"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2014-04-07 08:50+0000\n"
"Last-Translator: Pjotr12345 <Unknown>\n"
"Language-Team: Dutch <nl@li.org>\n"
"X-Launchpad-Export-Date: 2014-04-09 22:52+0000\n"
"X-Generator: Launchpad (build 16976)\n"
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Kon geen webserver maken."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren."
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Over"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Voorkeuren"
msgid "Show"
msgstr "Tonen"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - Temperatuurbewaker"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Hulp"
msgstr "Metingen"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Grafiek"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "N.v.t."
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Sensor tonen in het menu van de Toepassingsindicator"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: kan ADL-bibliotheekbestand niet vinden"
msgid "Failed to retrieve NVIDIA information."
msgstr "Kon Nvidia-informatie niet ophalen."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "Variabele voor HOME niet ingesteld."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Logboekbestand van sensor is al geopend."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Kan logboekbestand van sensor niet openen: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Logboekbestand van sensor niet geopend."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Logboekbestand van sensor niet geopend, kan niet sluiten."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"Dit is vrije programmatuur: u mag hem wijzigen en doorgeven.\n"
"Er zit geen garantie op, voor zover de wet dat toestaat.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Gebruik: %s [OPTIE]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor is een GTK+ toepassing voor het bewaken van apparatuursensoren, "
"inclusief temperaturen en ventilatorsnelheden."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Opties:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help toon deze hulpinformatie en sluit af\n"
" -v, --version toon versie-informatie en sluit af"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL het webadres van de psensor-server,\n"
" voorbeeld: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
"schijfbewaking\n"
" i.p.v. hddtemp-achtergronddienst"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
" -n, --new-instance forceer het aanmaken van een nieuwe Psensor-toepassing"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL stel het foutopsporingsniveau in, integer tussen 0 en 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Meld fouten aan: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "Webpagina van %s: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr ""
"Psensor os niet gecompileerd met ondersteuning voor sensoren op afstand."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Schakelt foutopsporingsmodus in."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Probeer '%s --help' voor meer informatie.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Er bestaat reeds een instantie van Psensor."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Kon geen webserver maken."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Ongeldige JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>Stilzetting van server verzocht</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Pagina niet gevonden - ga naar <a href='/'>Hoofdpagina</a></"
"p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server is een HTTP-server voor het bewaken van apparatuursensoren op "
"afstand."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\ttoon deze hulptekst en sluit af\n"
" -v, --version\t\ttoon versie-infomatie en sluit af"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\twebserverpoort\n"
" -w,--wdir=DIR\t\tmap die webserverpagina's bevat"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL stel het foutopsporingsniveau in, integer tussen 0 "
"en 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH stel het logboekbestand in op PATH"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr " --sensor-log-file=PATH stel het sensorlogboekbestand in op PATH"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S stel de tussenpoze voor het sensorlogboek in op S "
"(seconden)"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP-verzoek: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Schakelt foutopsporingsmodus in: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Geen sensoren bespeurd."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Kon geen webserver maken."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Webserver gestart op poort: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW-map: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Kon logboeken bijhouden niet inschakelen voor sensoren."
msgid "Psensor Homepage"
msgstr "Thuispagina van Psensor"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Kon pictogram van Psensor niet laden."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Kies voorgrondkleur"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Sensor"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Waarde"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Min"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Max"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Kleur"
msgid "Fan alert"
msgstr "Ventilatorwaarschuwing"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Onbekend"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
+#: src/cfg.c:494
+#, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr ""
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, c-format
+msgid "Failed to save configuration file %s."
+msgstr ""
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr ""
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr ""
msgid "Show"
msgstr ""
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr ""
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr ""
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr ""
msgstr ""
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr ""
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr ""
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+msgid "Display sensor in the list of sensors"
+msgstr ""
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr ""
msgid "Failed to retrieve NVIDIA information."
msgstr ""
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr ""
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr ""
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr ""
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr ""
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr ""
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr ""
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr ""
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr ""
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
msgstr ""
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr ""
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
msgstr ""
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
msgstr ""
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
msgstr ""
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr ""
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr ""
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr ""
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr ""
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr ""
+#: src/main.c:597
+msgid "Failed to create thread for monitoring sensors"
+msgstr ""
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr ""
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr ""
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
msgstr ""
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
msgstr ""
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr ""
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr ""
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr ""
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr ""
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr ""
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr ""
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr ""
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr ""
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr ""
msgid "Psensor Homepage"
msgstr ""
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr ""
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr ""
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr ""
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr ""
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr ""
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr ""
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr ""
msgid "Fan alert"
msgstr ""
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr ""
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2013-09-01 18:54+0000\n"
"Last-Translator: Celio Alves <Unknown>\n"
"Language-Team: Brazilian Portuguese\n"
"X-Launchpad-Export-Date: 2013-10-18 06:32+0000\n"
"X-Generator: Launchpad (build 16799)\n"
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Falhou ao criar servidor web."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, c-format
+msgid "Failed to save configuration file %s."
+msgstr ""
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Sobre"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Preferências"
msgid "Show"
msgstr "Mostrar"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - Monitor de temperatura"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "Ajuda"
msgstr "Medidas"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Grafo"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "N/D"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+msgid "Display sensor in the list of sensors"
+msgstr ""
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: não foi possível encontrar a biblioteca ADL."
msgid "Failed to retrieve NVIDIA information."
msgstr "Falha ao recuperar informações de NVIDIA."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "Variável HOME não configurada."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Arquivo de registro do sensor já está aberto."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Não é possível abrir arquivo de log do sensor: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Arquivo de registros do sensor não foi aberto."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr ""
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Uso: %s [OPÇÃO]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor é um aplicativo GTK+ para monitoramento de sensores de hardware, "
"incluindo temperatura e velocidade de ventoinhas."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Opções:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help exibir esta ajuda e sair\n"
" -v, --version exibir informação de versão e sair"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL a URL do psensor-server,\n"
" exemplo: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
msgstr ""
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Relatar falhas para: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "Página inicial de %s: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr ""
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Ativar o modo de depuração"
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Utilize `%s --help' para mais informações.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Uma instancia de Psensor já existe."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Falhou ao criar servidor web."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "JSON inválido: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr ""
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Página não encontrada - Ir para a <a href='/'>página inicial</"
"a></p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server é um servidor HTTP para monitoramento remoto de sensores de "
"hardware."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
msgstr ""
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
msgstr ""
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr ""
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "Requisição HTTP: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Habilita modo de depuração: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Nenhum sensor detectado"
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Falhou ao criar servidor web."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Servidor web iniciado na porta: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "Diretório WWW: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr ""
msgid "Psensor Homepage"
msgstr "Site do Psensor"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Falha ao carregar o ícone do Psensor."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Selecionar cor do primeiro plano"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Sensor"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Valor"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Min"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Max"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Cor"
msgid "Fan alert"
msgstr "Alenta do ventilador"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Desconhecido"
msgstr ""
"Project-Id-Version: psensor 0.7.0.x\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2014-05-20 05:14+0000\n"
"Last-Translator: Dmitry Serov <dmitri.s93@gmail.com>\n"
"Language-Team: Russian\n"
"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n"
"X-Generator: Launchpad (build 17031)\n"
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Не удалось создать веб-сервер."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Не удалось включить журналирование датчиков."
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "О программе"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Параметры"
msgid "Show"
msgstr "Показать"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - монитор температуры"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr ""
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Справка"
msgstr "Замеры"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Диаграмма"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "Н/Д"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Показать датчик в индикаторе меню приложений"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: библиотека ADL не найдена."
msgid "Failed to retrieve NVIDIA information."
msgstr "Не удалось получить информацию NVIDIA."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "об/мин"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "Переменная HOME не установлена."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Файл журнала датчика уже открыт."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Не удалось открыть файл журнала датчика: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Файл журнала датчика не открыт."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Файл журнала датчика не открыт, не удалось закрыть."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Использование: %s [КЛЮЧ]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor — это GTK+ приложение для мониторинга аппаратных датчиков, включая "
"температуру и скорость вентилятора."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Опции:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help показать эту справку и выйти\n"
" -v, --version показать версию и выйти"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
msgstr ""
" -u, --url=URL URL psensor-сервера, пример: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --use-libatasmart использовать библиотеку atasmart для мониторинга "
"дисков вместо демона hddtemp"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
" -n, --new-instance принудительно запускает новую копию программы Psensor"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr " -d, --debug=УРОВЕНЬ установить уровень отладки, целое между 0 и 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Сообщайте об ошибках на: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s домашняя страница: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor не был собран с поддержкой удалённых датчиков."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Включает режим отладки."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Попробуйте `%s --help' для дополнительной информации.↵\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Копия Psensor уже запущена."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Не удалось создать веб-сервер."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Неправильный JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>Запрошена остановка сервера</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Страница не найдена - Перейти к <a href='/'>Главной странице</"
"a></p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server — это HTTP-сервер для удалённого мониторинга аппаратных "
"датчиков."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tпоказать эту справку и выйти\n"
" -v, --version\t\tпоказать версию и выйти"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\tпорт веб-сервера\n"
" -w,--wdir=DIR\t\tдиректория для страниц веб-сервера"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr " -d, --debug=LEVEL установить уровень отладки, целое между 0 и 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=ПУТЬ установить ПУТЬ к файлу журнала"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr " --sensor-log-file=ПУТЬ установить ПУТЬ к файлу журнала датчика"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=ПЕРИОД установить ПЕРИОД журналирования датчиков (в "
"секундах)"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP запрос: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Включает режим отладки: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Датчики не обнаружены."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Не удалось создать веб-сервер."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Веб-сервер запущен на порту: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW-каталог: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Не удалось включить журналирование датчиков."
msgid "Psensor Homepage"
msgstr "Домашняя страница Psensor"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Не удалось загрузить значок Psensor."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Выберите цвет переднего плана"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Датчик"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Значение"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Мин."
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Макс."
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Цвет"
msgid "Fan alert"
msgstr "Уведомление вентилятора"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr ""
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2012-04-14 21:02+0000\n"
"Last-Translator: Jean-Philippe Orsini <jeanfi@gmail.com>\n"
"Language-Team: Slovenian <sl@li.org>\n"
"X-Launchpad-Export-Date: 2012-07-02 08:28+0000\n"
"X-Generator: Launchpad (build 15520)\n"
+#: src/cfg.c:494
+#, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr ""
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, c-format
+msgid "Failed to save configuration file %s."
+msgstr ""
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr ""
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr ""
msgid "Show"
msgstr ""
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr ""
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr ""
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr ""
msgstr ""
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr ""
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr ""
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+msgid "Display sensor in the list of sensors"
+msgstr ""
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr ""
msgid "Failed to retrieve NVIDIA information."
msgstr ""
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr ""
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr ""
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr ""
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr ""
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr ""
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr ""
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr ""
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr ""
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
msgstr ""
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr ""
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
msgstr ""
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
msgstr ""
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
msgstr ""
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr ""
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr ""
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr ""
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr ""
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr ""
+#: src/main.c:597
+msgid "Failed to create thread for monitoring sensors"
+msgstr ""
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr ""
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr ""
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
msgstr ""
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
msgstr ""
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr ""
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr ""
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr ""
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr ""
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr ""
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr ""
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr ""
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr ""
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr ""
msgid "Psensor Homepage"
msgstr ""
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr ""
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr ""
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr ""
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr ""
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr ""
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr ""
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr ""
msgid "Fan alert"
msgstr ""
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr ""
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2012-05-03 02:31+0000\n"
"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
"Language-Team: Serbian <sr@li.org>\n"
"X-Launchpad-Export-Date: 2012-07-02 08:28+0000\n"
"X-Generator: Launchpad (build 15520)\n"
+#: src/cfg.c:494
+#, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr ""
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, c-format
+msgid "Failed to save configuration file %s."
+msgstr ""
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "О програму"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Поставке"
msgid "Show"
msgstr ""
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr ""
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr ""
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr ""
msgstr ""
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr ""
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "Недоступно"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+msgid "Display sensor in the list of sensors"
+msgstr ""
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr ""
msgid "Failed to retrieve NVIDIA information."
msgstr ""
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr ""
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr ""
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr ""
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr ""
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr ""
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr ""
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr ""
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Употреба: %s [ОПЦИЈА]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
msgstr ""
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Опције:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
msgstr ""
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
msgstr ""
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
msgstr ""
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Пријавите грешку на: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s матична страна: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr ""
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr ""
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Покушајте„%s --help“ за више информација.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr ""
+#: src/main.c:597
+msgid "Failed to create thread for monitoring sensors"
+msgstr ""
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr ""
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr ""
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
msgstr ""
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
msgstr ""
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr ""
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr ""
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr ""
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr ""
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr ""
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr ""
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr ""
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr ""
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr ""
msgid "Psensor Homepage"
msgstr "Матична страница Псензора"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr ""
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Одаберите боју текста"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Сензор"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr ""
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Најмање"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Највише"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "У боји"
msgid "Fan alert"
msgstr ""
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr ""
msgstr ""
"Project-Id-Version: psensor 1.0.0.0\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
-"PO-Revision-Date: 2014-06-01 13:09+0000\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
+"PO-Revision-Date: 2014-08-02 18:45+0000\n"
"Last-Translator: Josef Andersson <Unknown>\n"
"Language-Team: Swedish\n"
"Language: sv\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n"
-"X-Generator: Launchpad (build 17031)\n"
+"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n"
+"X-Generator: Launchpad (build 17174)\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#: src/cfg.c:494
+#, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Misslyckades med att skapa katalogen %s: %s"
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr "Konfigurationsfilen existerar inte"
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr "Misslyckades med att tolka konfigurationsfilen: %s"
+
+#: src/cfg.c:569
+#, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Misslyckades med att spara konfigurationsfilen %s."
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Om"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Inställningar"
msgid "Show"
msgstr "Visa"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - Temperaturövervakare"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Hjälp"
#: src/glade/psensor-pref.glade:254
msgid "Temperature unit:"
-msgstr "Temperaturenheter:"
+msgstr "Temperaturenhet:"
#: src/glade/psensor-pref.glade:272
msgid "Position of sensors table:"
#: src/glade/psensor-pref.glade:504
msgid "<i>Max</i>"
-msgstr "<i>Min</i>"
+msgstr "<i>Max</i>"
#: src/glade/psensor-pref.glade:530
msgid "Colors"
msgstr "Mätningar"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Graf"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "Ej tillgänglig"
#: src/glade/sensor-edit.glade:429
msgid "Display sensor in the label (experimental)"
-msgstr "Visa sensor i etiketten (exprimentiell)"
+msgstr "Visa sensor i etiketten (experimentell)"
#: src/glade/sensor-edit.glade:500
msgid "-1"
msgstr "-1"
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Visa sensor i meny"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: kan inte hitta ADL-bibliotek."
#: src/lib/hdd_atasmart.c:152
#, c-format
msgid "atasmart: sk_disk_open() failure: %s."
-msgstr "atasmart: sk_disk_open() fel: %s."
+msgstr "atasmart: sk_disk_open()-fel: %s."
#: src/lib/hdd_hddtemp.c:59
msgid "hddtemp: failed to open socket."
msgid ""
"NVIDIA proprietary driver not used or cannot retrieve NVIDIA GPU temperature."
msgstr ""
-"Properitär NVIDIA-drivrutin ej använd, eller kan inte hämta NVIDIA GPU-"
+"Proprietär NVIDIA-drivrutin ej använd, eller kan inte hämta NVIDIA GPU-"
"temperatur."
#: src/lib/nvidia.c:95
msgid "Failed to retrieve NVIDIA information."
msgstr "Misslyckades med att hämta NVIDIA-information."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "HOME-variabel inte inställd."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Sensorloggfil redan öppen."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Kan inte öppna sensorloggfil: %s"
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Sensorloggfil ej öppen."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Sensorloggfil ej öppen, kan inte stänga."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"Det här är fri programvara: Du kan fritt modifiera den och distribuera den\n"
"Det finns INGEN GARANTI i den omfattning som medges av gällande lag.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
-msgstr "Användning: %s [OPTION]...\n"
+msgstr "Användning: %s [FLAGGA]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor är ett GTK+-program för att övervaka hårdvarusensorer, inklusive "
"temperaturer och fläkthastigheter."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Alternativ:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help visa denna hjälp och avsluta\n"
" -v, --version visa versionsinformation och avsluta"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL URL för psensor-server,\n"
" exempelvis: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
msgstr ""
-" --use-libatasmart använd atasmart library för diskövervakning istället "
-"för\n"
+" --use-libatasmart använd atasmart-biblioteket för diskövervakning "
+"istället för\n"
" hddtemp-demon"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr " -n, --new-instance tvinga fram att skapa ett nytt Psensor-program"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL ställ in felsökningsnivå, heltal mellan nivå 0 och 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Rapportera fel till: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s webbplats <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor har inte kompilerats med fjärrsensorstöd."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Aktivera felsökningsläge."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prova`%s --help' för mer information.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Det finns redan en Psensor-instans."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Misslyckades med att skapa katalogen %s: %s"
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Ogiltig JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>Begärde serverstopp</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Hittade inte sida - Gå till <a href='/'>Huvudsida</a></p></"
"body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server är en HTTP-server för att fjärrövervaka hårdvarusensorer."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tvisa denna hjälp och avsluta\n"
" -v, --version\t\tvisa versionsinformation och avsluta"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\twebbserverport\n"
" -w,--wdir=DIR\t\tkatalog som innehåller webbserversidor"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr " -d, --debug=LEVEL ställ in felsökningnivån mellan 0 and 3"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH ställ in loggfilen till PATH"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
-msgstr " --sensor-log-file=PATH ställ in loggintervall för sensor till PATH"
+msgstr " --sensor-log-file=PATH ställ in loggfil för sensor till PATH"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S ställ in loggintervall för sensor till S (sekunder)"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP-begäran: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
-msgstr "Aktivera felsökningsläge: %d"
+msgstr "Aktiverar felsökningsläge: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Inga sensorer hittades."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Misslyckades med att skapa webbserver."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Webbserver startade på port: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW-katalog: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Misslyckades med att aktivera sensorloggning."
msgid "Psensor Homepage"
msgstr "Psensor-webbplats"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Misslyckades med att läsa in Psensor-ikon."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Välj förgrundsfärg"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Sensor"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Värde"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Min"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Max"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Färg"
msgid "Fan alert"
msgstr "Fläktlarm"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Okänd"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
-"PO-Revision-Date: 2013-11-24 08:42+0000\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
+"PO-Revision-Date: 2014-07-19 20:17+0000\n"
"Last-Translator: İbrahim Çelik <ibrahimcelik89@gmail.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-02-11 20:01+0000\n"
-"X-Generator: Launchpad (build 16916)\n"
+"X-Launchpad-Export-Date: 2014-08-27 08:00+0000\n"
+"X-Generator: Launchpad (build 17174)\n"
+
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Web sunucusu oluşturulamadı."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr "Yapılandırma dosyası mevcut değil."
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi."
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Hakkında"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Tercihler"
msgid "Show"
msgstr "Göster"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - Sıcaklık Gözlemleyici"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr "_Psensor"
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Yardım"
#: src/glade/psensor-pref.glade:209
msgid "Celsius"
-msgstr ""
+msgstr "Celsius"
#: src/glade/psensor-pref.glade:210
msgid "Fahrenheit"
#: src/glade/psensor-pref.glade:299
msgid "Launch on session startup"
-msgstr ""
+msgstr "Oturum başlangıcında başlat"
#: src/glade/psensor-pref.glade:320
msgid "Hide window on startup"
#: src/glade/psensor-pref.glade:367
msgid "Startup"
-msgstr ""
+msgstr "Başlangıç"
#: src/glade/psensor-pref.glade:405
msgid "Foreground:"
msgstr "Ölçümler"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Grafik"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "Bilinmeyen"
#: src/glade/sensor-edit.glade:429
#, fuzzy
msgid "Display sensor in the label (experimental)"
-msgstr "Algılayıcıyı Uygulama Göstergesi menüsünde göster"
+msgstr "Etikette algılayıcı göster (deneysel)"
#: src/glade/sensor-edit.glade:500
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "Algılayıcıları menüde göster"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: ADL kütüphanesi bulunamadı."
#: src/lib/cpu.c:46
msgid "CPU"
-msgstr ""
+msgstr "İşlemci"
#: src/lib/hdd_atasmart.c:57 src/lib/hdd_hddtemp.c:122
msgid "Disk"
-msgstr ""
+msgstr "Disk"
#: src/lib/hdd_atasmart.c:152
#, c-format
#: src/lib/lmsensor.c:148
msgid "Intel CPU"
-msgstr ""
+msgstr "İntel işlemci"
#: src/lib/lmsensor.c:152
msgid "AMD CPU"
-msgstr ""
+msgstr "AMD işlemci"
#: src/lib/lmsensor.c:154 src/lib/nvidia.c:73
msgid "NVIDIA GPU"
-msgstr ""
+msgstr "NVIDIA Ekran Kartı"
#: src/lib/lmsensor.c:156
msgid "VIA CPU"
-msgstr ""
+msgstr "VIA İşlemci"
#: src/lib/lmsensor.c:218
#, c-format
msgid "Failed to retrieve NVIDIA information."
msgstr "NVIDIA bilgisi alınamıyor."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "RPM"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "HOME değişkeni ayarlanmamış."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "Algılayıcı günlük kaydı dosyası zaten açık."
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "Algılayıcı günlük kaydı dosyası açılamıyor: %s."
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "Algılayıcı günlük kaydı dosyası açık değil."
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "Algılayıcı günlük kaydı açık değil, kapatılamıyor."
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"Bu bir özgür yazılımdır: değiştirmekte ve yeniden dağıtmakta özgürsünüz.\n"
"Yasaların izin verdiği çerçevede hiçbir garantisi YOKTUR.\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Kullanım: %s [SEÇENEK]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
"Psensor, sıcaklık ve fan hızı da dahil olmak üzere donanım algılayıcılarını "
"gözlemleyen bir GTK+ uygulamasıdır."
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Seçenekler:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help yardımı göster ve çık\n"
" -v, --version sürüm bilgisini göster ve çık"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL psensor sunucusunun bağlantısı,\n"
" example: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --use-libatasmart disk gözlemleme için hddtemp yerine bir atasmart\n"
" kütüphanesi kullan"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr ""
" -n, --new-instance yeni bir Psensor uygulaması oluşturulmasını zorla"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL hata ayıklama seviyesin ayarla, 0 ve 3 arasında tamsayı"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Hataları rapor et:%s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s ana sayfa: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor, uzaktan algılayıcı desteği ile derlenmemiştir."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Hata ayıklama modunu etkinleştirir."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "Bir Psensor örneği zaten mevcut."
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Web sunucusu oluşturulamadı."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Geçersiz JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>Sunucu durdurma istendi</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Sayfa bulunamadı - Şuraya gidin <a href='/'>Main page</a></"
"p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-sunucusu, donanım algılayıcılarını uzaktan gözlemleme amaçlı bir "
"HTTP sunucusudur."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tyardımı göster ve çık\n"
" -v, --version\t\tsürüm bilgisini göster ve çık"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\twebsunucu bağlantı noktası\n"
" -w,--wdir=DIR\t\tdizin websunucusu sayfaları içerir"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
" -d, --debug=LEVEL hata ayıklama seviyesini ayarla, 0 ve 3 arasında bir "
"tamsayı"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH günlük kaydı dosyasını PATH olarak ayarla"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
" --sensor-log-file=PATH algılayıcı günlük kaydı dosyasını PATH olarak ayarla"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
" --sensor-log-interval=S algılayıcı günlük kaydı aralığını S (saniye) "
"olarak ayarla"
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP İsteği: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "Hata ayıklama modunu etkinleştirir: %d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Hiçbir algılayıcı bulunamadı."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Web sunucusu oluşturulamadı."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "Web sunucusu şu noktadan başlatıldı: %d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW dizini: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "Algılayıcıların günlük kaydı etkinleştirilemedi."
msgid "Psensor Homepage"
msgstr "Psensor Anasayfası"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Psensor simgesi yüklenemedi."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Önplan rengini seçin"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Algılayıcı"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Değer"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Asgari"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Azami"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Renk"
msgid "Fan alert"
msgstr "Fan uyarısı"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "Bilinmeyen"
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2012-10-13 16:24+0000\n"
"Last-Translator: Ilya Volchanetskiy <Unknown>\n"
"Language-Team: Ukrainian <uk@li.org>\n"
"X-Launchpad-Export-Date: 2013-01-21 09:32+0000\n"
"X-Generator: Launchpad (build 16430)\n"
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "Не вдалося створити веб-сервер."
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, c-format
+msgid "Failed to save configuration file %s."
+msgstr ""
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "Про програму"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "Налаштування"
msgid "Show"
msgstr "Показати"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr ""
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr ""
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "_Довдіка"
msgstr "Заміри"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "Діаграма"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "Н/Д"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+msgid "Display sensor in the list of sensors"
+msgstr ""
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD: не вдалося знайти бібліотеку ADL."
msgid "Failed to retrieve NVIDIA information."
msgstr "Не вдалося отримати інформацію NVIDIA."
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "об/хв"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "Змінна HOME не встановлена."
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr ""
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr ""
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr ""
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr ""
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "Використання: %s [КЛЮЧ]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
msgstr ""
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "Опції:"
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help показати цю довідку і вийти\n"
" -v, --version показати версію і вийти"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
msgstr ""
" -u, --url=URL URL psensor-сервера, наприклад: http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --use-libatasmart використовувати бібліотеку atasmart для моніторингу\n"
"дисків замість демона hddtemp"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr " -n, --new-instance примусово створювати нову копію програми Psensor"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr " -d, --debug=РІВЕНЬ встановити рівень налагодження, ціле між 0 та 3"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "Звітуйте про помилки до: %s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s домашня сторінка: <%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor не був зібраний з підтримкою віддалених датчиків."
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "Включає режим налагодження."
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "Спробуйте `%s --help' щоб отримати більше інформації.\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr ""
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "Не вдалося створити веб-сервер."
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "Неправильний JSON: %s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr ""
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr ""
"<html><body><p>Сторінка не знайдена - Перейти до <a href='/'>Головної "
"сторінки</a></p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr ""
"psensor-server — це HTTP-сервер для віддаленого моніторингу апаратних "
"датчиків."
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\tпоказати цю довідку і вийти\n"
" -v, --version\t\tпоказати версію і вийти"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\tпорт веб-сервера\n"
" -w,--wdir=DIR\t\tдиректорія для сторінок веб-сервера"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr ""
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr ""
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr ""
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP запит: %s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr ""
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "Датчики не знайдені."
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "Не вдалося створити веб-сервер."
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr ""
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW-директорія: %s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr ""
msgid "Psensor Homepage"
msgstr "Домашня сторінка Psensor"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "Не вдалося завантажити іконку Psensor."
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "Оберіть колір переднього плану"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "Датчик"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "Значення"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "Мін."
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "Макс."
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "Колір"
msgid "Fan alert"
msgstr ""
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr ""
msgstr ""
"Project-Id-Version: psensor\n"
"Report-Msgid-Bugs-To: jeanfi@gmail.com\n"
-"POT-Creation-Date: 2014-06-01 00:22+0200\n"
+"POT-Creation-Date: 2014-08-27 10:01+0200\n"
"PO-Revision-Date: 2014-05-01 13:23+0000\n"
"Last-Translator: Wang Dianjin <Unknown>\n"
"Language-Team: Chinese (simplified)\n"
"X-Launchpad-Export-Date: 2014-06-02 08:08+0000\n"
"X-Generator: Launchpad (build 17031)\n"
+#: src/cfg.c:494
+#, fuzzy, c-format
+msgid "Failed to create the directory %s: %s"
+msgstr "无法创建网络服务器。"
+
+#: src/cfg.c:542
+msgid "The configuration file does not exist."
+msgstr ""
+
+#: src/cfg.c:545
+#, c-format
+msgid "Failed to parse configuration file: %s"
+msgstr ""
+
+#: src/cfg.c:569
+#, fuzzy, c-format
+msgid "Failed to save configuration file %s."
+msgstr "无法激活监测器日志。"
+
#: src/glade/psensor.glade:6
msgid "About"
msgstr "关于"
#: src/glade/psensor.glade:10 src/glade/psensor.glade:11
-#: src/glade/psensor.glade:20 src/ui_sensorlist.c:209
+#: src/glade/psensor.glade:20 src/ui_sensorlist.c:217
msgid "Preferences"
msgstr "首选项"
msgid "Show"
msgstr "显示"
-#: src/glade/psensor.glade:184
+#: src/glade/psensor.glade:186
msgid "Psensor - Temperature Monitor"
msgstr "Psensor - 温度监视器"
-#: src/glade/psensor.glade:199
+#: src/glade/psensor.glade:201
msgid "_Psensor"
msgstr ""
-#: src/glade/psensor.glade:246
+#: src/glade/psensor.glade:248
msgid "_Help"
msgstr "帮助(_H)"
msgstr "测量"
#: src/glade/psensor-pref.glade:691 src/glade/sensor-edit.glade:264
-#: src/ui_sensorlist.c:334
+#: src/ui_sensorlist.c:364
msgid "Graph"
msgstr "图表"
#: src/glade/sensor-edit.glade:155 src/glade/sensor-edit.glade:202
#: src/glade/sensor-edit.glade:249 src/glade/sensor-edit.glade:475
-#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:490 src/ui_notify.c:81
+#: src/glade/sensor-edit.glade:523 src/lib/psensor.c:481 src/ui_notify.c:81
msgid "N/A"
msgstr "不可用"
msgid "-1"
msgstr ""
+#: src/glade/sensor-edit.glade:541
+#, fuzzy
+msgid "Display sensor in the list of sensors"
+msgstr "在应用指示器菜单中显示监视器"
+
#: src/lib/amd.c:168
msgid "AMD: cannot found ADL library."
msgstr "AMD：未找到 ADL 库。"
msgid "Failed to retrieve NVIDIA information."
msgstr "无法获取 NVIDIA 信息。"
-#: src/lib/psensor.c:486 tests/test_psensor_type_to_unit_str.c:62
+#: src/lib/psensor.c:477 tests/test_psensor_type_to_unit_str.c:62
msgid "RPM"
msgstr "转速"
-#: src/lib/psensor.c:488
+#: src/lib/psensor.c:479
msgid "%"
msgstr "%"
-#: src/lib/slog.c:86
+#: src/lib/slog.c:87
msgid "HOME variable not set."
msgstr "未设置 HOME 变量。"
-#: src/lib/slog.c:96
+#: src/lib/slog.c:97
msgid "Sensor log file already open."
msgstr "已经打开监测器日志文件。"
-#: src/lib/slog.c:105
+#: src/lib/slog.c:106
#, c-format
msgid "Cannot open sensor log file: %s."
msgstr "无法打开监测器日志文件：%s。"
-#: src/lib/slog.c:136
+#: src/lib/slog.c:137
msgid "Sensor log file not open."
msgstr "监测器日志文件未打开。"
-#: src/lib/slog.c:192
+#: src/lib/slog.c:193
msgid "Sensor log not open, cannot close."
msgstr "监测器日志未打开，故无法关闭。"
-#: src/main.c:77 src/server/server.c:84
+#: src/main.c:78 src/server/server.c:85
#, c-format
msgid ""
"Copyright (C) %s jeanfi@gmail.com\n"
"本软件为自由软件：您可以自由修改并分发。\n"
"There is NO WARRANTY, to the extent permitted by law。\n"
-#: src/main.c:88 src/server/server.c:94
+#: src/main.c:89 src/server/server.c:95
#, c-format
msgid "Usage: %s [OPTION]...\n"
msgstr "用法：%s [选项]...\n"
-#: src/main.c:90
+#: src/main.c:91
msgid ""
"Psensor is a GTK+ application for monitoring hardware sensors, including "
"temperatures and fan speeds."
msgstr "Psensor 是一款 GTK+ 应用程序，可监测硬件传感器，包括温度与风扇转速。"
-#: src/main.c:94
+#: src/main.c:95
msgid "Options:"
msgstr "选项："
-#: src/main.c:95
+#: src/main.c:96
msgid ""
" -h, --help display this help and exit\n"
" -v, --version display version information and exit"
" -h, --help 显示这个帮助并退出\n"
" -v, --version 显示版本信息并退出"
-#: src/main.c:101
+#: src/main.c:102
msgid ""
" -u, --url=URL the URL of the psensor-server,\n"
" example: http://hostname:3131"
" -u, --url=URL psensor 服务器 URL\n"
" 例如：http://hostname:3131"
-#: src/main.c:104
+#: src/main.c:105
msgid ""
" --use-libatasmart use atasmart library for disk monitoring instead of\n"
" hddtemp daemon"
" --use-libatasmart 使用 atasmart 库来监测硬盘，而不是\n"
" hddtemp 进程"
-#: src/main.c:107
+#: src/main.c:108
msgid " -n, --new-instance force the creation of a new Psensor application"
msgstr " -n, --new-instance 强制创建一个新的 Psensor 例程"
-#: src/main.c:110
+#: src/main.c:111
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr " -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数"
-#: src/main.c:115 src/server/server.c:117
+#: src/main.c:116 src/server/server.c:118
#, c-format
msgid "Report bugs to: %s\n"
msgstr "报告问题至：%s\n"
-#: src/main.c:117 src/server/server.c:119
+#: src/main.c:118 src/server/server.c:120
#, c-format
msgid "%s home page: <%s>\n"
msgstr "%s 主页：<%s>\n"
-#: src/main.c:454
+#: src/main.c:453
msgid "Psensor has not been compiled with remote sensor support."
msgstr "Psensor 不支持远程传感器。"
-#: src/main.c:517
+#: src/main.c:515
msgid "Enables debug mode."
msgstr "启用调试模式。"
-#: src/main.c:529 src/server/server.c:380
+#: src/main.c:527 src/server/server.c:381
#, c-format
msgid "Try `%s --help' for more information.\n"
msgstr "试用‘%s --help’来获得更多信息。\n"
-#: src/main.c:542
+#: src/main.c:540
msgid "A Psensor instance already exists."
msgstr "已存在一个 Psensor 例程。"
+#: src/main.c:597
+#, fuzzy
+msgid "Failed to create thread for monitoring sensors"
+msgstr "无法创建网络服务器。"
+
#: src/rsensor.c:107
#, c-format
msgid "Fail to connect to: %s"
msgid "Invalid JSON: %s"
msgstr "无效 JSON：%s"
-#: src/server/server.c:54
+#: src/server/server.c:55
msgid "<html><body><p>Server stop requested</p></body></html>"
msgstr "<html><body><p>服务器停止请求</p></body></html>"
-#: src/server/server.c:60
+#: src/server/server.c:61
msgid ""
"<html><body><p>Page not found - Go to <a href='/'>Main page</a></p></body>"
msgstr "<html><body><p>未找到页面 - 请访问<a href='/'>主页</a></p></body>"
-#: src/server/server.c:96
+#: src/server/server.c:97
msgid ""
"psensor-server is an HTTP server for monitoring hardware sensors remotely."
msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。"
-#: src/server/server.c:101
+#: src/server/server.c:102
msgid ""
" -h, --help\t\tdisplay this help and exit\n"
" -v, --version\t\tdisplay version information and exit"
" -h, --help\t\t 显示本帮助并退出\n"
" -v, --version\t\t 显示版本信息并退出"
-#: src/server/server.c:105
+#: src/server/server.c:106
msgid ""
" -p,--port=PORT\twebserver port\n"
" -w,--wdir=DIR\t\tdirectory containing webserver pages"
" -p,--port=PORT\t 网络服务器端口\n"
" -w,--wdir=DIR\t\t 包括网络服务器页面的目录"
-#: src/server/server.c:109
+#: src/server/server.c:110
msgid " -d, --debug=LEVEL set the debug level, integer between 0 and 3"
msgstr " -d, --debug=LEVEL 设置调试级别，0～3 之间的整数"
-#: src/server/server.c:111
+#: src/server/server.c:112
msgid " -l, --log-file=PATH set the log file to PATH"
msgstr " -l, --log-file=PATH 将日志文件设为 PATH"
-#: src/server/server.c:112
+#: src/server/server.c:113
msgid " --sensor-log-file=PATH set the sensor log file to PATH"
msgstr " --sensor-log-file=路径 设置监测器日志文件的路径"
-#: src/server/server.c:113
+#: src/server/server.c:114
msgid " --sensor-log-interval=S set the sensor log interval to S (seconds)"
msgstr ""
-#: src/server/server.c:297
+#: src/server/server.c:298
#, c-format
msgid "HTTP Request: %s"
msgstr "HTTP 请求：%s"
-#: src/server/server.c:360
+#: src/server/server.c:361
#, c-format
msgid "Enables debug mode: %d"
msgstr "启用调试模式：%d"
-#: src/server/server.c:402
+#: src/server/server.c:405
msgid "No sensors detected."
msgstr "未检测到传感器。"
-#: src/server/server.c:409
+#: src/server/server.c:412
msgid "Failed to create Web server."
msgstr "无法创建网络服务器。"
-#: src/server/server.c:413
+#: src/server/server.c:416
#, c-format
msgid "Web server started on port: %d"
msgstr "网络服务器启动端口：%d"
-#: src/server/server.c:414
+#: src/server/server.c:417
#, c-format
msgid "WWW directory: %s"
msgstr "WWW 目录：%s"
-#: src/server/server.c:415
+#: src/server/server.c:418
#, c-format
msgid "URL: http://localhost:%d"
msgstr "URL: http://localhost:%d"
-#: src/server/server.c:425
+#: src/server/server.c:428
msgid "Failed to activate logging of sensors."
msgstr "无法激活监测器日志。"
msgid "Psensor Homepage"
msgstr "Psensor 主页"
-#: src/ui.c:217
+#: src/ui.c:216
msgid "Failed to load Psensor icon."
msgstr "无法加载 Psensor 图标。"
-#: src/ui_sensorlist.c:245
+#: src/ui_sensorlist.c:253
msgid "Select foreground color"
msgstr "选择前景色"
-#: src/ui_sensorlist.c:297
+#: src/ui_sensorlist.c:327
msgid "Sensor"
msgstr "监视设备"
-#: src/ui_sensorlist.c:303
+#: src/ui_sensorlist.c:333
msgid "Value"
msgstr "值"
-#: src/ui_sensorlist.c:309
+#: src/ui_sensorlist.c:339
msgid "Min"
msgstr "最小值"
-#: src/ui_sensorlist.c:315
+#: src/ui_sensorlist.c:345
msgid "Max"
msgstr "最大值"
-#: src/ui_sensorlist.c:322
+#: src/ui_sensorlist.c:352
msgid "Color"
msgstr "颜色"
msgid "Fan alert"
msgstr "风扇警报"
-#: src/ui_sensorpref.c:234
+#: src/ui_sensorpref.c:248
msgid "Unknown"
msgstr "未知"
endif
endif
-# -no-deprecated-declarations to avoid some glib deprecation warnings
-AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
+AM_CPPFLAGS =-Wall -Werror \
-DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
-DDATADIR=\""$(datadir)"\"\
+ -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\"\
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/unity \
$(GTK_CFLAGS)\
- $(GCONF_CFLAGS)\
$(SENSORS_CFLAGS)
DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
LIBS = \
lib/libpsensor.a \
$(GTK_LIBS)\
- $(GCONF_LIBS)\
$(PTHREAD_LIBS)\
$(SENSORS_LIBS)
if GTK
if X11
if XEXT
-if GCONF
bin_PROGRAMS = psensor
dist_man_MANS = psensor.1
endif
endif
endif
-endif
psensor_SOURCES = \
cfg.h cfg.c \
EXTRA_DIST = description.txt psensor.schemas
-if GCONF
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_DATA = psensor.schemas
-
-install-data-local:
- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
-endif
-
psensor.1: main.c $(top_srcdir)/configure.ac
$(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT)
+gsettings_SCHEMAS=psensor.gschema.xml
+EXTRA_DIST=$(gsettings_SCHEMAS)
+
+@GSETTINGS_RULES@
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
-
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
@JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_1 = server
-@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS = \
-@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@ psensor$(EXEEXT)
+@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS = psensor$(EXEEXT)
@GTOP_TRUE@am__append_2 = $(GTOP_CFLAGS)
@GTOP_TRUE@am__append_3 = $(GTOP_LIBS)
@LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c
@CURL_TRUE@@JSON_TRUE@am__append_20 = $(CURL_LIBS) $(JSON_LIBS)
@CURL_TRUE@@JSON_TRUE@am__append_21 = $(CURL_CFLAGS) $(JSON_CFLAGS)
subdir = src
-DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp $(dist_man_MANS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
- "$(DESTDIR)$(schemadir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
PROGRAMS = $(bin_PROGRAMS)
am__psensor_SOURCES_DIST = cfg.h cfg.c notify_cmd.c notify_cmd.h \
graph.h graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
$(am__objects_4)
psensor_OBJECTS = $(am_psensor_OBJECTS)
psensor_LDADD = $(LDADD)
+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 = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(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_CC_1 =
CCLD = $(CC)
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_CCLD_1 =
SOURCES = $(psensor_SOURCES)
DIST_SOURCES = $(am__psensor_SOURCES_DIST)
-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;; \
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(dist_man_MANS)
-DATA = $(schema_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 \
+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 = lib glade server
reldir="$$dir2"
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@
LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@
LIBOBJS = @LIBOBJS@
-LIBS = lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) $(PTHREAD_LIBS) \
- $(SENSORS_LIBS) $(am__append_3) $(am__append_5) \
- $(am__append_8) $(am__append_11) $(am__append_13) \
- $(am__append_15) $(am__append_18) $(am__append_20)
+LIBS = lib/libpsensor.a $(GTK_LIBS) $(PTHREAD_LIBS) $(SENSORS_LIBS) \
+ $(am__append_3) $(am__append_5) $(am__append_8) \
+ $(am__append_11) $(am__append_13) $(am__append_15) \
+ $(am__append_18) $(am__append_20)
LTLIBICONV = @LTLIBICONV@
LTLIBINTL = @LTLIBINTL@
LTLIBOBJS = @LTLIBOBJS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
# -export-dynamic is need for defining handlers in the glade file.
AM_LDFLAGS = -Wl,--as-needed -export-dynamic
-
-# -no-deprecated-declarations to avoid some glib deprecation warnings
-AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
- -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
- -DDATADIR=\""$(datadir)"\" -I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/unity $(GTK_CFLAGS) $(GCONF_CFLAGS) \
- $(SENSORS_CFLAGS) $(am__append_2) $(am__append_6) \
- $(am__append_9) $(am__append_10) $(am__append_12) \
- $(am__append_14) $(am__append_17) $(am__append_21)
-@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
+AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DPSENSOR_DESKTOP_FILE=\""psensor.desktop"\" \
+ -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \
+ $(GTK_CFLAGS) $(SENSORS_CFLAGS) $(am__append_2) \
+ $(am__append_6) $(am__append_9) $(am__append_10) \
+ $(am__append_12) $(am__append_14) $(am__append_17) \
+ $(am__append_21)
+@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
psensor_SOURCES = cfg.h cfg.c notify_cmd.c notify_cmd.h graph.h \
graph.c main.c ui.h ui.c ui_appindicator.h ui_color.h \
ui_color.c ui_graph.h ui_graph.c ui_pref.h ui_pref.c \
ui_sensorpref.c ui_status.h ui_status.c pxdg.h pxdg.c \
$(am__append_4) $(am__append_7) $(am__append_16) \
$(am__append_19)
-EXTRA_DIST = description.txt psensor.schemas
-@GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
-@GCONF_TRUE@schema_DATA = psensor.schemas
+EXTRA_DIST = $(gsettings_SCHEMAS)
+gsettings_SCHEMAS = psensor.gschema.xml
all: all-recursive
.SUFFIXES:
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ ; 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 } \
@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
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
psensor$(EXEEXT): $(psensor_OBJECTS) $(psensor_DEPENDENCIES) $(EXTRA_psensor_DEPENDENCIES)
@rm -f psensor$(EXEEXT)
- $(LINK) $(psensor_OBJECTS) $(psensor_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(psensor_OBJECTS) $(psensor_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_unity.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
install-man1: $(dist_man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-schemaDATA: $(schema_DATA)
- @$(NORMAL_INSTALL)
- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(schemadir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(schemadir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
- done
-
-uninstall-schemaDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(schemadir)'; $(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; \
$(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 \
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; \
$$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
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
distdir: $(DISTFILES)
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them" >&2; \
- exit 1; \
- else :; fi; \
- else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
done
check-am: all-am
check: check-recursive
-all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
+all-am: Makefile $(PROGRAMS) $(MANS)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(schemadir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@GCONF_FALSE@install-data-local:
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
info-am:
-install-data-am: install-data-local install-man install-schemaDATA
+install-data-am: install-man
install-dvi: install-dvi-recursive
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-man uninstall-schemaDATA
+uninstall-am: uninstall-binPROGRAMS uninstall-man
uninstall-man: uninstall-man1
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-binPROGRAMS \
- clean-generic ctags ctags-recursive distclean \
- distclean-compile distclean-generic distclean-tags distdir dvi \
- dvi-am html html-am info info-am install install-am \
- install-binPROGRAMS install-data install-data-am \
- install-data-local install-dvi install-dvi-am install-exec \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-binPROGRAMS clean-generic cscopelist-am \
+ ctags ctags-am distclean distclean-compile distclean-generic \
+ 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-man1 install-pdf \
- install-pdf-am install-ps install-ps-am install-schemaDATA \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
- ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-binPROGRAMS uninstall-man uninstall-man1 \
- uninstall-schemaDATA
-
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+ uninstall-man uninstall-man1
-@GCONF_TRUE@install-data-local:
-@GCONF_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
psensor.1: main.c $(top_srcdir)/configure.ac
$(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)
help2man --include=description.txt -N --name="Temperature monitoring application" --output=psensor.1 ./psensor$(EXEEXT)
+@GSETTINGS_RULES@
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
+
+#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
+#include <sys/stat.h>
+#include <sys/types.h>
-#include "cfg.h"
-#include <plog.h>
+#include <locale.h>
+#include <libintl.h>
+#define _(str) gettext(str)
-static const char *KEY_SENSORS = "/apps/psensor/sensors";
+#include <gio/gio.h>
-static const char *ATT_SENSOR_ALARM_ENABLED = "alarm/enabled";
-static const char *ATT_SENSOR_ALARM_HIGH_THRESHOLD = "alarm/high_threshold";
-static const char *ATT_SENSOR_ALARM_LOW_THRESHOLD = "alarm/low_threshold";
+#include <cfg.h>
+#include <pio.h>
+#include <plog.h>
+
+/* Properties of each sensor */
+static const char *ATT_SENSOR_ALARM_ENABLED = "alarm_enabled";
+static const char *ATT_SENSOR_ALARM_HIGH_THRESHOLD = "alarm_high_threshold";
+static const char *ATT_SENSOR_ALARM_LOW_THRESHOLD = "alarm_low_threshold";
static const char *ATT_SENSOR_COLOR = "color";
-static const char *ATT_SENSOR_ENABLED = "enabled";
+static const char *ATT_SENSOR_GRAPH_ENABLED = "graph_enabled";
static const char *ATT_SENSOR_NAME = "name";
-static const char *ATT_SENSOR_APPINDICATOR_DISABLED = "appindicator/disabled";
+static const char *ATT_SENSOR_APPINDICATOR_MENU_DISABLED
+= "appindicator_menu_disabled";
static const char *ATT_SENSOR_APPINDICATOR_LABEL_ENABLED
-= "appindicator/menu/enabled";
-
+= "appindicator_label_enabled";
static const char *ATT_SENSOR_POSITION = "position";
+static const char *ATT_SENSOR_HIDE = "hide";
+/* Update interval of the measures of the sensors */
static const char *KEY_SENSOR_UPDATE_INTERVAL
-= "/apps/psensor/sensor/update_interval";
+= "sensor-update-interval";
-static const char *KEY_GRAPH_UPDATE_INTERVAL
-= "/apps/psensor/graph/update_interval";
+/* Graph settings */
+static const char *KEY_GRAPH_UPDATE_INTERVAL = "graph-update-interval";
-static const char *KEY_GRAPH_MONITORING_DURATION
-= "/apps/psensor/graph/monitoring_duration";
+static const char *KEY_GRAPH_MONITORING_DURATION = "graph-monitoring-duration";
-static const char *KEY_GRAPH_BACKGROUND_COLOR
-= "/apps/psensor/graph/background_color";
+static const char *KEY_GRAPH_BACKGROUND_COLOR = "graph-background-color";
static const char *DEFAULT_GRAPH_BACKGROUND_COLOR = "#e8f4e8f4a8f5";
-static const char *KEY_GRAPH_BACKGROUND_ALPHA
-= "/apps/psensor/graph/background_alpha";
+static const char *KEY_GRAPH_BACKGROUND_ALPHA = "graph-background-alpha";
static const char *KEY_GRAPH_FOREGROUND_COLOR
-= "/apps/psensor/graph/foreground_color";
+= "graph-foreground-color";
+
static const char *DEFAULT_GRAPH_FOREGROUND_COLOR = "#000000000000";
-static const char *KEY_ALPHA_CHANNEL_ENABLED
-= "/apps/psensor/graph/alpha_channel_enabled";
+static const char *KEY_ALPHA_CHANNEL_ENABLED = "graph-alpha-channel-enabled";
+/* Inteface settings */
static const char *KEY_INTERFACE_SENSORLIST_POSITION
-= "/apps/psensor/interface/sensorlist_position";
+= "interface-sensorlist-position";
static const char *KEY_INTERFACE_WINDOW_DECORATION_DISABLED
-= "/apps/psensor/interface/window_decoration_disabled";
+= "interface-window-decoration-disabled";
static const char *KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED
-= "/apps/psensor/interface/window_keep_below_enabled";
+= "interface-window-keep-below-enabled";
static const char *KEY_INTERFACE_MENU_BAR_DISABLED
-= "/apps/psensor/interface/menu_bar_disabled";
+= "interface-menu-bar-disabled";
static const char *KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED
-= "/apps/psensor/interface/unity_launcher_count_disabled";
+= "interface-unity-launcher-count-disabled";
static const char *KEY_INTERFACE_HIDE_ON_STARTUP
-= "/apps/psensor/interface/hide_on_startup";
+= "interface-hide-on-startup";
static const char *KEY_INTERFACE_WINDOW_RESTORE_ENABLED
-= "/apps/psensor/interface/window_restore_enabled";
+= "interface-window-restore-enabled";
-static const char *KEY_INTERFACE_WINDOW_X = "/apps/psensor/interface/window_x";
-static const char *KEY_INTERFACE_WINDOW_Y = "/apps/psensor/interface/window_y";
-static const char *KEY_INTERFACE_WINDOW_W = "/apps/psensor/interface/window_w";
-static const char *KEY_INTERFACE_WINDOW_H = "/apps/psensor/interface/window_h";
+static const char *KEY_INTERFACE_WINDOW_X = "interface-window-x";
+static const char *KEY_INTERFACE_WINDOW_Y = "interface-window-y";
+static const char *KEY_INTERFACE_WINDOW_W = "interface-window-w";
+static const char *KEY_INTERFACE_WINDOW_H = "interface-window-h";
static const char *KEY_INTERFACE_WINDOW_DIVIDER_POS
-= "/apps/psensor/interface/window_divider_pos";
+= "interface-window-divider-pos";
static const char *KEY_INTERFACE_TEMPERATURE_UNIT
-= "/apps/psensor/interface/temperature_unit";
+= "interface-temperature-unit";
+
+/* Sensor logging settings */
+static const char *KEY_SLOG_ENABLED = "slog-enabled";
+static const char *KEY_SLOG_INTERVAL = "slog-interval";
+
+/* Path to the script called when a notification is raised */
+static const char *KEY_NOTIFICATION_SCRIPT = "notif-script";
+
+static GSettings *settings;
+
+static char *user_dir;
-static const char *KEY_SLOG_ENABLED = "/apps/psensor/slog/enabled";
-static const char *KEY_SLOG_INTERVAL = "/apps/psensor/slog/interval";
+static GKeyFile *key_file;
-static const char *KEY_NOTIFICATION_SCRIPT = "/apps/psensor/notif_script";
+static char *sensor_config_path;
-static GConfClient *client;
+static void (*slog_enabled_cbk)(void *);
-static char *get_string(const char *key, const char *default_value)
+static char *get_string(const char *key)
{
- char *value;
+ return g_settings_get_string(settings, key);
+}
- value = gconf_client_get_string(client, key, NULL);
+static void set_string(const char *key, const char *str)
+{
+ g_settings_set_string(settings, key, str);
+}
- if (!value) {
- value = strdup(default_value);
- gconf_client_set_string(client, key, default_value, NULL);
- }
+static void set_bool(const char *k, bool b)
+{
+ g_settings_set_boolean(settings, k, b);
+}
+
+static bool get_bool(const char *k)
+{
+ return g_settings_get_boolean(settings, k);
+}
- return value;
+static void set_int(const char *k, int i)
+{
+ g_settings_set_int(settings, k, i);
+}
+
+static double get_double(const char *k)
+{
+ return g_settings_get_double(settings, k);
+}
+
+static void set_double(const char *k, double d)
+{
+ g_settings_set_double(settings, k, d);
+}
+
+static int get_int(const char *k)
+{
+ return g_settings_get_int(settings, k);
}
char *config_get_notif_script()
{
char *str;
- str = gconf_client_get_string(client, KEY_NOTIFICATION_SCRIPT, NULL);
+ str = get_string(KEY_NOTIFICATION_SCRIPT);
if (str && !strlen(str)) {
free(str);
str = NULL;
void config_set_notif_script(const char *str)
{
if (str && strlen(str) > 0)
- gconf_client_set_string(client,
- KEY_NOTIFICATION_SCRIPT, str, NULL);
+ set_string(KEY_NOTIFICATION_SCRIPT, str);
else
- gconf_client_set_string(client,
- KEY_NOTIFICATION_SCRIPT, "", NULL);
+ set_string(KEY_NOTIFICATION_SCRIPT, "");
}
static struct color *get_background_color()
char *scolor;
struct color *c;
- scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR,
- DEFAULT_GRAPH_BACKGROUND_COLOR);
+ scolor = get_string(KEY_GRAPH_BACKGROUND_COLOR);
c = str_to_color(scolor);
free(scolor);
if (!c)
- return color_new(0xffff, 0xffff, 0xffff);
+ return color_new(1, 1, 1);
return c;
}
char *scolor;
struct color *c;
- scolor = get_string(KEY_GRAPH_FOREGROUND_COLOR,
- DEFAULT_GRAPH_FOREGROUND_COLOR);
+ scolor = get_string(KEY_GRAPH_FOREGROUND_COLOR);
c = str_to_color(scolor);
free(scolor);
if (!c)
- return color_new(0x0000, 0x0000, 0x0000);
+ return color_new(0, 0, 0);
return c;
}
static bool is_alpha_channel_enabled()
{
- return gconf_client_get_bool(client, KEY_ALPHA_CHANNEL_ENABLED, NULL);
+ return get_bool(KEY_ALPHA_CHANNEL_ENABLED);
+}
+
+static void set_alpha_channeld_enabled(bool b)
+{
+ set_bool(KEY_ALPHA_CHANNEL_ENABLED, b);
}
static enum sensorlist_position get_sensorlist_position()
{
- return gconf_client_get_int(client,
- KEY_INTERFACE_SENSORLIST_POSITION, NULL);
+ return get_int(KEY_INTERFACE_SENSORLIST_POSITION);
}
static void set_sensorlist_position(enum sensorlist_position pos)
{
- gconf_client_set_int(client,
- KEY_INTERFACE_SENSORLIST_POSITION, pos, NULL);
+ set_int(KEY_INTERFACE_SENSORLIST_POSITION, pos);
}
static double get_graph_background_alpha()
{
- double a;
-
- a = gconf_client_get_float(client, KEY_GRAPH_BACKGROUND_ALPHA, NULL);
- if (a == 0)
- gconf_client_set_float(client,
- KEY_GRAPH_BACKGROUND_ALPHA, 1.0, NULL);
- return a;
+ return get_double(KEY_GRAPH_BACKGROUND_ALPHA);
}
static void set_graph_background_alpha(double alpha)
{
- gconf_client_set_float(client, KEY_GRAPH_BACKGROUND_ALPHA, alpha, NULL);
+ set_double(KEY_GRAPH_BACKGROUND_ALPHA, alpha);
}
static void set_background_color(const struct color *color)
if (!scolor)
scolor = strdup(DEFAULT_GRAPH_BACKGROUND_COLOR);
- gconf_client_set_string(client,
- KEY_GRAPH_BACKGROUND_COLOR, scolor, NULL);
+ set_string(KEY_GRAPH_BACKGROUND_COLOR, scolor);
free(scolor);
}
if (!str)
str = strdup(DEFAULT_GRAPH_FOREGROUND_COLOR);
- gconf_client_set_string(client, KEY_GRAPH_FOREGROUND_COLOR, str, NULL);
+ set_string(KEY_GRAPH_FOREGROUND_COLOR, str);
free(str);
}
-static char *get_sensor_att_key(const char *sid, const char *att)
+bool is_slog_enabled()
{
- char *esc_sid, *key;
-
- esc_sid = gconf_escape_key(sid, -1);
- /* [KEY_SENSORS]/[esc_sid]/[att] */
- key = malloc(strlen(KEY_SENSORS)
- + 1 + 2 * strlen(esc_sid)
- + 1 + strlen(att) + 1);
-
- sprintf(key, "%s/%s/%s", KEY_SENSORS, esc_sid, att);
-
- free(esc_sid);
+ return get_bool(KEY_SLOG_ENABLED);
+}
- return key;
+static void set_slog_enabled(bool enabled)
+{
+ set_bool(KEY_SLOG_ENABLED, enabled);
}
-struct color *
-config_get_sensor_color(const char *sid, const struct color *dft)
+static void slog_enabled_changed_cbk(GSettings *settings,
+ gchar *key,
+ gpointer data)
{
- char *key, *scolor;
- struct color *color;
+ if (slog_enabled_cbk)
+ slog_enabled_cbk(data);
+}
- key = get_sensor_att_key(sid, ATT_SENSOR_COLOR);
+void config_set_slog_enabled_changed_cbk(void (*cbk)(void *), void *data)
+{
+ log_fct_enter();
- scolor = gconf_client_get_string(client, key, NULL);
+ slog_enabled_cbk = cbk;
- color = NULL;
+ g_signal_connect_after(settings,
+ "changed::slog-enabled",
+ G_CALLBACK(slog_enabled_changed_cbk),
+ data);
- if (scolor)
- color = str_to_color(scolor);
+ log_fct_exit();
+}
- if (!scolor || !color) {
- color = color_new(dft->red, dft->green, dft->blue);
- scolor = color_to_str(color);
- gconf_client_set_string(client, key, scolor, NULL);
- }
+int config_get_slog_interval()
+{
+ return get_int(KEY_SLOG_INTERVAL);
+}
- free(scolor);
- free(key);
+static void set_slog_interval(int interval)
+{
+ if (interval <= 0)
+ interval = 300;
- return color;
+ set_int(KEY_SLOG_INTERVAL, interval);
}
-void config_set_sensor_color(const char *sid, const struct color *color)
+static bool is_window_decoration_enabled()
{
- char *key, *scolor;
+ return !get_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED);
+}
- key = get_sensor_att_key(sid, ATT_SENSOR_COLOR);
- scolor = color_to_str(color);
+static bool is_window_keep_below_enabled()
+{
+ return get_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED);
+}
- gconf_client_set_string(client, key, scolor, NULL);
+static void set_window_decoration_enabled(bool enabled)
+{
+ set_bool(KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled);
+}
- free(scolor);
- free(key);
+static void set_window_keep_below_enabled(bool enabled)
+{
+ set_bool(KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED, enabled);
}
-int config_get_sensor_alarm_high_threshold(const char *sid)
+static void init()
{
- int res;
- char *key;
+ log_fct_enter();
- key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
- res = gconf_client_get_int(client, key, NULL);
- free(key);
+ if (!settings)
+ settings = g_settings_new("psensor");
- return res;
+ log_fct_exit();
}
-void
-config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
+void config_cleanup()
{
- char *key;
+ config_sync();
- key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
- gconf_client_set_int(client, key, threshold, NULL);
- free(key);
-}
+ if (settings) {
+ g_settings_sync();
+ g_object_unref(settings);
+ settings = NULL;
+ }
-int config_get_sensor_alarm_low_threshold(const char *sid)
-{
- int res;
- char *key;
+ if (user_dir) {
+ free(user_dir);
+ user_dir = NULL;
+ }
- key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
- res = gconf_client_get_int(client, key, NULL);
- free(key);
+ if (key_file) {
+ g_key_file_free(key_file);
+ key_file = NULL;
+ }
+
+ if (sensor_config_path) {
+ free(sensor_config_path);
+ sensor_config_path = NULL;
+ }
- return res;
+ slog_enabled_cbk = NULL;
}
-void
-config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
+struct config *config_load()
{
- char *key;
+ struct config *c;
- key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
- gconf_client_set_int(client, key, threshold, NULL);
- free(key);
-}
+ init();
-bool config_get_sensor_alarm_enabled(const char *sid)
-{
- gboolean b;
- char *key;
+ c = malloc(sizeof(struct config));
- key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_ENABLED);
- b = gconf_client_get_bool(client, key, NULL);
- free(key);
+ c->graph_bgcolor = get_background_color();
+ c->graph_fgcolor = get_foreground_color();
+ c->graph_bg_alpha = get_graph_background_alpha();
+ c->alpha_channel_enabled = is_alpha_channel_enabled();
+ c->sensorlist_position = get_sensorlist_position();
+ c->window_decoration_enabled = is_window_decoration_enabled();
+ c->window_keep_below_enabled = is_window_keep_below_enabled();
+ c->slog_enabled = is_slog_enabled();
+ c->slog_interval = config_get_slog_interval();
- return b;
-}
+ c->sensor_update_interval
+ = get_int(KEY_SENSOR_UPDATE_INTERVAL);
+ if (c->sensor_update_interval < 1)
+ c->sensor_update_interval = 1;
-void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
-{
- char *key;
+ c->graph_update_interval = get_int(KEY_GRAPH_UPDATE_INTERVAL);
+ if (c->graph_update_interval < 1)
+ c->graph_update_interval = 1;
+
+ c->graph_monitoring_duration = get_int(KEY_GRAPH_MONITORING_DURATION);
+
+ if (c->graph_monitoring_duration < 1)
+ c->graph_monitoring_duration = 10;
+
+ c->sensor_values_max_length
+ = (c->graph_monitoring_duration * 60) / c->sensor_update_interval;
+
+ if (c->sensor_values_max_length < 3)
+ c->sensor_values_max_length = 3;
+
+ c->menu_bar_disabled = get_bool(KEY_INTERFACE_MENU_BAR_DISABLED);
+
+ c->unity_launcher_count_disabled
+ = get_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED);
+
+ c->hide_on_startup = get_bool(KEY_INTERFACE_HIDE_ON_STARTUP);
+
+ c->window_restore_enabled
+ = get_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED);
- key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_ENABLED);
- gconf_client_set_bool(client, key, enabled, NULL);
- free(key);
+ c->window_x = get_int(KEY_INTERFACE_WINDOW_X);
+ c->window_y = get_int(KEY_INTERFACE_WINDOW_Y);
+ c->window_w = get_int(KEY_INTERFACE_WINDOW_W);
+ c->window_h = get_int(KEY_INTERFACE_WINDOW_H);
+
+ c->window_divider_pos = get_int(KEY_INTERFACE_WINDOW_DIVIDER_POS);
+
+ if (!c->window_restore_enabled || !c->window_w || !c->window_h) {
+ c->window_w = 800;
+ c->window_h = 200;
+ }
+
+ c->temperature_unit = get_int(KEY_INTERFACE_TEMPERATURE_UNIT);
+
+ return c;
}
-bool config_is_sensor_enabled(const char *sid)
+void config_save(const struct config *c)
{
- gboolean b;
- char *key;
+ set_alpha_channeld_enabled(c->alpha_channel_enabled);
+ set_background_color(c->graph_bgcolor);
+ set_foreground_color(c->graph_fgcolor);
+ set_graph_background_alpha(c->graph_bg_alpha);
+ set_sensorlist_position(c->sensorlist_position);
+ set_window_decoration_enabled(c->window_decoration_enabled);
+ set_window_keep_below_enabled(c->window_keep_below_enabled);
+ set_slog_enabled(c->slog_enabled);
+ set_slog_interval(c->slog_interval);
+
+ set_int(KEY_GRAPH_UPDATE_INTERVAL, c->graph_update_interval);
+
+ set_int(KEY_GRAPH_MONITORING_DURATION, c->graph_monitoring_duration);
+
+ set_int(KEY_SENSOR_UPDATE_INTERVAL, c->sensor_update_interval);
+
+ set_bool(KEY_INTERFACE_MENU_BAR_DISABLED, c->menu_bar_disabled);
+
+ set_bool(KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED,
+ c->unity_launcher_count_disabled);
+
+ set_bool(KEY_INTERFACE_HIDE_ON_STARTUP, c->hide_on_startup);
+
+ set_bool(KEY_INTERFACE_WINDOW_RESTORE_ENABLED,
+ c->window_restore_enabled);
+
+ set_int(KEY_INTERFACE_WINDOW_X, c->window_x);
+ set_int(KEY_INTERFACE_WINDOW_Y, c->window_y);
+ set_int(KEY_INTERFACE_WINDOW_W, c->window_w);
+ set_int(KEY_INTERFACE_WINDOW_H, c->window_h);
- key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED);
- b = gconf_client_get_bool(client, key, NULL);
- free(key);
+ set_int(KEY_INTERFACE_WINDOW_DIVIDER_POS, c->window_divider_pos);
- return b;
+ set_int(KEY_INTERFACE_TEMPERATURE_UNIT, c->temperature_unit);
}
-void config_set_sensor_enabled(const char *sid, bool enabled)
+const char *get_psensor_user_dir()
{
- char *key;
+ const char *home;
+
+ log_fct_enter();
+
+ if (!user_dir) {
+ home = getenv("HOME");
+
+ if (!home)
+ return NULL;
+
+ user_dir = path_append(home, ".psensor");
- key = get_sensor_att_key(sid, ATT_SENSOR_ENABLED);
- gconf_client_set_bool(client, key, enabled, NULL);
- free(key);
+ if (mkdir(user_dir, 0700) == -1 && errno != EEXIST) {
+ log_err(_("Failed to create the directory %s: %s"),
+ user_dir,
+ strerror(errno));
+
+ free(user_dir);
+ user_dir = NULL;
+ }
+ }
+
+ log_fct_exit();
+
+ return user_dir;
}
-char *config_get_sensor_name(const char *sid)
+static const char *get_sensor_config_path()
{
- char *name, *key;
+ const char *dir;
- key = get_sensor_att_key(sid, ATT_SENSOR_NAME);
- name = gconf_client_get_string(client, key, NULL);
- free(key);
+ if (!sensor_config_path) {
+ dir = get_psensor_user_dir();
- return name;
+ if (dir)
+ sensor_config_path = path_append(dir, "psensor.cfg");
+ }
+
+ return sensor_config_path;
}
-void config_set_sensor_name(const char *sid, const char *name)
+static GKeyFile *get_sensor_key_file()
{
- char *key;
+ int ret;
+ GError *err;
+ const char *path;
+
+ if (!key_file) {
+ path = get_sensor_config_path();
+
+ key_file = g_key_file_new();
- key = get_sensor_att_key(sid, ATT_SENSOR_NAME);
- gconf_client_set_string(client, key, name, NULL);
- free(key);
+ err = NULL;
+ ret = g_key_file_load_from_file(key_file,
+ path,
+ G_KEY_FILE_KEEP_COMMENTS
+ | G_KEY_FILE_KEEP_TRANSLATIONS,
+ &err);
+
+ if (!ret) {
+ if (err->code == G_KEY_FILE_ERROR_NOT_FOUND)
+ log_fct(_("The configuration file "
+ "does not exist."));
+ else
+ log_err(_("Failed to parse configuration "
+ "file: %s"),
+ path);
+ }
+ }
+
+ return key_file;
}
-int config_get_sensor_position(const char *sid)
+static void save_sensor_key_file()
{
- char *key;
- int pos;
+ GKeyFile *kfile;
+ const char *path;
+ char *data;
- key = get_sensor_att_key(sid, ATT_SENSOR_POSITION);
- pos = gconf_client_get_int(client, key, NULL);
- free(key);
+ log_fct_enter();
- return pos;
+ kfile = get_sensor_key_file();
+
+ data = g_key_file_to_data(kfile, NULL, NULL);
+
+ path = get_sensor_config_path();
+
+ if (!g_file_set_contents(path, data, -1, NULL))
+ log_err(_("Failed to save configuration file %s."), path);
+
+ free(data);
+
+ log_fct_exit();
}
-void config_set_sensor_position(const char *sid, int pos)
+void config_sync()
{
- char *key;
-
- key = get_sensor_att_key(sid, ATT_SENSOR_POSITION);
- gconf_client_set_int(client, key, pos, NULL);
- free(key);
+ log_fct_enter();
+ if (settings)
+ g_settings_sync();
+ save_sensor_key_file();
+ log_fct_exit();
}
-bool config_is_appindicator_enabled(const char *sid)
+static void sensor_set_str(const char *sid, const char *att, const char *str)
{
- char *key;
- gboolean b;
+ GKeyFile *kfile;
+
+ kfile = get_sensor_key_file();
+ g_key_file_set_string(kfile, sid, att, str);
+}
- key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED);
- b = gconf_client_get_bool(client, key, NULL);
- free(key);
+static char *sensor_get_str(const char *sid, const char *att)
+{
+ GKeyFile *kfile;
- return !b;
+ kfile = get_sensor_key_file();
+ return g_key_file_get_string(kfile, sid, att, NULL);
}
-void config_set_appindicator_enabled(const char *sid, bool enabled)
+static bool sensor_get_bool(const char *sid, const char *att)
{
- char *key;
+ GKeyFile *kfile;
- key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_DISABLED);
- gconf_client_set_bool(client, key, !enabled, NULL);
- free(key);
+ kfile = get_sensor_key_file();
+ return g_key_file_get_boolean(kfile, sid, att, NULL);
}
-bool config_is_appindicator_label_enabled(const char *sid)
+static void sensor_set_bool(const char *sid, const char *att, bool enabled)
{
- char *key;
- gboolean b;
+ GKeyFile *kfile;
- key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
- b = gconf_client_get_bool(client, key, NULL);
- free(key);
+ kfile = get_sensor_key_file();
- return b;
+ g_key_file_set_boolean(kfile, sid, att, enabled);
}
-void config_set_appindicator_label_enabled(const char *sid, bool enabled)
+static int sensor_get_int(const char *sid, const char *att)
{
- char *key;
+ GKeyFile *kfile;
- key = get_sensor_att_key(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
- gconf_client_set_bool(client, key, enabled, NULL);
- free(key);
+ kfile = get_sensor_key_file();
+ return g_key_file_get_integer(kfile, sid, att, NULL);
}
-bool is_slog_enabled()
+static void sensor_set_int(const char *sid, const char *att, int i)
{
- return gconf_client_get_bool(client, KEY_SLOG_ENABLED, NULL);
+ GKeyFile *kfile;
+
+ kfile = get_sensor_key_file();
+
+ g_key_file_set_integer(kfile, sid, att, i);
}
-static void set_slog_enabled(bool enabled)
+char *config_get_sensor_name(const char *sid)
{
- gconf_client_set_bool(client, KEY_SLOG_ENABLED, enabled, NULL);
+ return sensor_get_str(sid, ATT_SENSOR_NAME);
}
-void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data)
+void config_set_sensor_name(const char *sid, const char *name)
{
- log_debug("config_slog_enabled_notify_add");
- gconf_client_add_dir(client,
- KEY_SLOG_ENABLED,
- GCONF_CLIENT_PRELOAD_NONE,
- NULL);
- gconf_client_notify_add(client,
- KEY_SLOG_ENABLED,
- cbk,
- data,
- NULL,
- NULL);
+ sensor_set_str(sid, ATT_SENSOR_NAME, name);
}
-int config_get_slog_interval()
+void config_set_sensor_color(const char *sid, const struct color *color)
{
- int res;
+ char *scolor;
- res = gconf_client_get_int(client, KEY_SLOG_INTERVAL, NULL);
+ scolor = color_to_str(color);
- if (res <= 0)
- return 300;
- else
- return res;
+ sensor_set_str(sid, ATT_SENSOR_COLOR, scolor);
+
+ free(scolor);
}
-static void set_slog_interval(int interval)
+struct color *
+config_get_sensor_color(const char *sid, const struct color *dft)
{
- if (interval <= 0)
- interval = 300;
+ char *scolor;
+ struct color *color;
+
+ scolor = sensor_get_str(sid, ATT_SENSOR_COLOR);
- gconf_client_set_int(client, KEY_SLOG_INTERVAL, interval, NULL);
+ if (scolor)
+ color = str_to_color(scolor);
+ else
+ color = NULL;
+
+ if (!color) {
+ color = color_new(dft->red, dft->green, dft->blue);
+ config_set_sensor_color(sid, color);
+ }
+
+ free(scolor);
+
+ return color;
}
-static bool is_window_decoration_enabled()
+bool config_is_sensor_graph_enabled(const char *sid)
{
- return !gconf_client_get_bool(client,
- KEY_INTERFACE_WINDOW_DECORATION_DISABLED,
- NULL);
+ return sensor_get_bool(sid, ATT_SENSOR_GRAPH_ENABLED);
}
-static bool is_window_keep_below_enabled()
+void config_set_sensor_graph_enabled(const char *sid, bool enabled)
{
- return gconf_client_get_bool(client,
- KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
- NULL);
+ sensor_set_bool(sid, ATT_SENSOR_GRAPH_ENABLED, enabled);
}
-static void set_window_decoration_enabled(bool enabled)
+int config_get_sensor_alarm_high_threshold(const char *sid)
{
- gconf_client_set_bool
- (client,
- KEY_INTERFACE_WINDOW_DECORATION_DISABLED, !enabled, NULL);
+ return sensor_get_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD);
}
-static void set_window_keep_below_enabled(bool enabled)
+void config_set_sensor_alarm_high_threshold(const char *sid, int threshold)
{
- gconf_client_set_bool(client,
- KEY_INTERFACE_WINDOW_KEEP_BELOW_ENABLED,
- enabled, NULL);
+ sensor_set_int(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD, threshold);
}
-/*
- * Initializes the GConf client.
- */
-static void init()
+int config_get_sensor_alarm_low_threshold(const char *sid)
{
- if (!client)
- client = gconf_client_get_default();
+ return sensor_get_int(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD);
}
-void config_cleanup()
+void config_set_sensor_alarm_low_threshold(const char *sid, int threshold)
{
- if (client) {
- g_object_unref(client);
- client = NULL;
- }
+ sensor_set_int(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD, threshold);
}
-struct config *config_load()
+bool config_is_appindicator_enabled(const char *sid)
{
- struct config *c;
-
- init();
-
- c = malloc(sizeof(struct config));
-
- c->graph_bgcolor = get_background_color();
- c->graph_fgcolor = get_foreground_color();
- c->graph_bg_alpha = get_graph_background_alpha();
- c->alpha_channel_enabled = is_alpha_channel_enabled();
- c->sensorlist_position = get_sensorlist_position();
- c->window_decoration_enabled = is_window_decoration_enabled();
- c->window_keep_below_enabled = is_window_keep_below_enabled();
- c->slog_enabled = is_slog_enabled();
- c->slog_interval = config_get_slog_interval();
-
- c->sensor_update_interval
- = gconf_client_get_int(client, KEY_SENSOR_UPDATE_INTERVAL, NULL);
- if (c->sensor_update_interval < 1)
- c->sensor_update_interval = 1;
-
- c->graph_update_interval
- = gconf_client_get_int(client, KEY_GRAPH_UPDATE_INTERVAL, NULL);
- if (c->graph_update_interval < 1)
- c->graph_update_interval = 1;
-
- c->graph_monitoring_duration
- = gconf_client_get_int(client, KEY_GRAPH_MONITORING_DURATION, NULL);
-
- if (c->graph_monitoring_duration < 1)
- c->graph_monitoring_duration = 10;
-
- c->sensor_values_max_length
- =
- (c->graph_monitoring_duration * 60) / c->sensor_update_interval;
- if (c->sensor_values_max_length < 3)
- c->sensor_values_max_length = 3;
+ return !sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_MENU_DISABLED);
+}
- c->menu_bar_disabled
- = gconf_client_get_bool(client,
- KEY_INTERFACE_MENU_BAR_DISABLED,
- NULL);
+void config_set_appindicator_enabled(const char *sid, bool enabled)
+{
+ return sensor_set_bool(sid,
+ ATT_SENSOR_APPINDICATOR_MENU_DISABLED,
+ !enabled);
+}
- c->unity_launcher_count_disabled
- = gconf_client_get_bool
- (client,
- KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED,
- NULL);
+int config_get_sensor_position(const char *sid)
+{
+ return sensor_get_int(sid, ATT_SENSOR_POSITION);
+}
- c->hide_on_startup
- = gconf_client_get_bool(client,
- KEY_INTERFACE_HIDE_ON_STARTUP,
- NULL);
+void config_set_sensor_position(const char *sid, int pos)
+{
+ return sensor_set_int(sid, ATT_SENSOR_POSITION, pos);
+}
- c->window_restore_enabled
- = gconf_client_get_bool(client,
- KEY_INTERFACE_WINDOW_RESTORE_ENABLED,
- NULL);
-
- c->window_x = gconf_client_get_int(client,
- KEY_INTERFACE_WINDOW_X,
- NULL);
- c->window_y = gconf_client_get_int(client,
- KEY_INTERFACE_WINDOW_Y,
- NULL);
- c->window_w = gconf_client_get_int(client,
- KEY_INTERFACE_WINDOW_W,
- NULL);
- c->window_h = gconf_client_get_int(client,
- KEY_INTERFACE_WINDOW_H,
- NULL);
- c->window_divider_pos
- = gconf_client_get_int(client,
- KEY_INTERFACE_WINDOW_DIVIDER_POS,
- NULL);
+bool config_get_sensor_alarm_enabled(const char *sid)
+{
+ return sensor_get_bool(sid, ATT_SENSOR_ALARM_ENABLED);
+}
- if (!c->window_restore_enabled || !c->window_w || !c->window_h) {
- c->window_w = 800;
- c->window_h = 200;
- }
+void config_set_sensor_alarm_enabled(const char *sid, bool enabled)
+{
+ sensor_set_bool(sid, ATT_SENSOR_ALARM_ENABLED, enabled);
+}
- c->temperature_unit = gconf_client_get_int
- (client, KEY_INTERFACE_TEMPERATURE_UNIT, NULL);
+bool config_is_sensor_enabled(const char *sid)
+{
+ return !sensor_get_bool(sid, ATT_SENSOR_HIDE);
+}
- return c;
+void config_set_sensor_enabled(const char *sid, bool enabled)
+{
+ sensor_set_bool(sid, ATT_SENSOR_HIDE, !enabled);
}
-void config_save(const struct config *c)
+bool config_is_appindicator_label_enabled(const char *sid)
{
- set_background_color(c->graph_bgcolor);
- set_foreground_color(c->graph_fgcolor);
- set_graph_background_alpha(c->graph_bg_alpha);
- set_sensorlist_position(c->sensorlist_position);
- set_window_decoration_enabled(c->window_decoration_enabled);
- set_window_keep_below_enabled(c->window_keep_below_enabled);
- set_slog_enabled(c->slog_enabled);
- set_slog_interval(c->slog_interval);
+ return sensor_get_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED);
+}
- gconf_client_set_int(client,
- KEY_GRAPH_UPDATE_INTERVAL,
- c->graph_update_interval, NULL);
-
- gconf_client_set_int(client,
- KEY_GRAPH_MONITORING_DURATION,
- c->graph_monitoring_duration, NULL);
-
- gconf_client_set_int(client,
- KEY_SENSOR_UPDATE_INTERVAL,
- c->sensor_update_interval, NULL);
-
- gconf_client_set_bool(client,
- KEY_INTERFACE_MENU_BAR_DISABLED,
- c->menu_bar_disabled, NULL);
-
- gconf_client_set_bool(client,
- KEY_INTERFACE_UNITY_LAUNCHER_COUNT_DISABLED,
- c->unity_launcher_count_disabled, NULL);
-
- gconf_client_set_bool(client,
- KEY_INTERFACE_HIDE_ON_STARTUP,
- c->hide_on_startup, NULL);
-
- gconf_client_set_bool(client,
- KEY_INTERFACE_WINDOW_RESTORE_ENABLED,
- c->window_restore_enabled,
- NULL);
-
- gconf_client_set_int(client, KEY_INTERFACE_WINDOW_X, c->window_x, NULL);
- gconf_client_set_int(client, KEY_INTERFACE_WINDOW_Y, c->window_y, NULL);
- gconf_client_set_int(client, KEY_INTERFACE_WINDOW_W, c->window_w, NULL);
- gconf_client_set_int(client, KEY_INTERFACE_WINDOW_H, c->window_h, NULL);
-
- gconf_client_set_int(client,
- KEY_INTERFACE_WINDOW_DIVIDER_POS,
- c->window_divider_pos,
- NULL);
-
- gconf_client_set_int(client,
- KEY_INTERFACE_TEMPERATURE_UNIT,
- c->temperature_unit,
- NULL);
+void config_set_appindicator_label_enabled(const char *sid, bool enabled)
+{
+ sensor_set_bool(sid, ATT_SENSOR_APPINDICATOR_LABEL_ENABLED, enabled);
}
#ifndef _PSENSOR_CONFIG_H_
#define _PSENSOR_CONFIG_H_
-#include <gconf/gconf-client.h>
-
-#include "bool.h"
-#include "color.h"
+#include <bool.h>
+#include <color.h>
enum temperature_unit {
CELSIUS,
bool alpha_channel_enabled;
- /*
- * Position of the sensors list table
- */
+ /* Position of the sensors list table */
enum sensorlist_position sensorlist_position;
bool window_decoration_enabled;
int slog_interval;
};
-/*
- Loads config from GConf
-*/
+/* Loads psensor configuration */
struct config *config_load();
void config_save(const struct config *);
bool config_get_sensor_alarm_enabled(const char *);
void config_set_sensor_alarm_enabled(const char *, bool);
-bool config_is_sensor_enabled(const char *);
-void config_set_sensor_enabled(const char *, bool);
+bool config_is_sensor_graph_enabled(const char *);
+void config_set_sensor_graph_enabled(const char *, bool);
char *config_get_sensor_name(const char *);
void config_set_sensor_name(const char *, const char *);
bool config_is_appindicator_label_enabled(const char *);
void config_set_appindicator_label_enabled(const char *, bool);
-void config_slog_enabled_notify_add(GConfClientNotifyFunc cbk, void *data);
bool is_slog_enabled();
+void config_set_slog_enabled_changed_cbk(void (*)(void *), void *);
int config_get_slog_interval();
char *config_get_notif_script();
void config_set_notif_script(const char *);
+
+bool config_is_sensor_enabled(const char *sid);
+void config_set_sensor_enabled(const char *sid, bool enabled);
+
+/*
+ * Returns the user directory containing psensor data (configuration
+ * and log).
+ * Corresponds to $HOME/.psensor/
+ * Creates the directory if it does not exist;
+ * Returns NULL if it cannot be determined.
+ */
+const char *get_psensor_user_dir();
+
+void config_sync();
+
#endif
+++ /dev/null
-[description]
-
-/psensor is a/
-
-It displays a curve for each sensor, and uses Desktop Notification to
-raise an alarm when a temperature is too high. On Ubuntu an
-Application Indicator is also available, its icon changes when a
-temperature alert is raised.
-
-It can monitor:
- * the temperature of the motherboard and CPU sensors (using lm\-sensors).
- * the temperature of the NVidia GPUs (using XNVCtrl).
- * the temperature and fan rotation speed of the ATI GPUs.
- * the temperature of the Hard Disk Drives (using hddtemp or atasmart
- library).
- * the rotation speed of the fans (using lm\-sensors).
- * the sensors of a remote computer (using psensor\-server).
-
-Psensor requires lm\-sensors to be correctly installed and configured,
-it can be checked by running the command 'sensors'. If it has never be
-done, you may need to run the command 'sensors\-detect' and follow the
-instruction. See the manpages of sensors(1) and sensors\-detect(8) for
-more information.
-
-To retrieve the temperature of the Hard Disk Drives, the hddtemp
-daemon must be running or atasmart used ('\-\-use\-libatasmart').
-
-For remote monitoring:
- * start psensor\-server(1) on the remote computer
- * run psensor with '\-\-url' option: 'psensor \-\-url=http://localhost:3131'
-
-ATI/AMD GPUs monitoring is available if the library libatiadlxx is
-present in the directory /usr/lib and psensor has been compiled with
-the ATI ADL SDK.
-
-Log messages are written to '$HOME/.psensor/log'.
-
-By default, if a Psensor process is already running, the command
-psensor will show the graph window then exit.
-It is possible to run multiple instances of Psensor by using the
-option '\-\-new\-instance'.
-
-[SEE ALSO]
-
-psensor\-server(1), sensors(1), sensors\-detect(8), hddtemp(8)
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = src/glade
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(gladedir)"
DATA = $(glade_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(glade_DATA)'; test -n "$(gladedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(gladedir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic 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-gladeDATA \
- 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-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-gladeDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic 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-gladeDATA 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-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-gladeDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
</object>
</child>
<child>
+ <object class="GtkSeparatorMenuItem" id="menuitem10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ <child>
<object class="GtkImageMenuItem" id="menuitem1">
<property name="related_action">AppIndicatorPreferencesAction</property>
<property name="visible">True</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- </child>
- <child>
<object class="GtkImageMenuItem" id="menuitem5">
<property name="related_action">AboutAction</property>
<property name="visible">True</property>
<column type="gchararray"/>
<!-- column-name gpointer1 -->
<column type="gpointer"/>
+ <!-- column-name gboolean2 -->
+ <column type="gboolean"/>
</columns>
</object>
<object class="GtkWindow" id="window">
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">9</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">9</property>
+ <property name="top_attach">10</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">10</property>
+ <property name="top_attach">11</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">11</property>
+ <property name="top_attach">12</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">12</property>
+ <property name="top_attach">13</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">13</property>
+ <property name="top_attach">14</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">14</property>
+ <property name="top_attach">15</property>
<property name="width">2</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">10</property>
+ <property name="top_attach">11</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="top_attach">11</property>
+ <property name="top_attach">12</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="sensor_enable_checkbox">
+ <property name="label" translatable="yes">Display sensor in the list of sensors</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">4</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="ui_sensorpref_display_toggled_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="resize">True</property>
cairo_fill(cr);
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
- bgcolor->f_red,
- bgcolor->f_green,
- bgcolor->f_blue,
+ bgcolor->red,
+ bgcolor->green,
+ bgcolor->blue,
config->graph_bg_alpha);
else
cairo_set_source_rgb(cr,
- bgcolor->f_red,
- bgcolor->f_green,
- bgcolor->f_blue);
+ bgcolor->red,
+ bgcolor->green,
+ bgcolor->blue);
cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
cairo_fill(cr);
cairo_set_line_width(cr, 1);
cairo_set_dash(cr, dashes, ndash, 0);
cairo_set_source_rgb(cr,
- color->f_red, color->f_green, color->f_blue);
+ color->red, color->green, color->blue);
/* vertical lines representing time steps */
for (i = 0; i <= 5; i++) {
double v;
cairo_set_source_rgb(cr,
- s->color->f_red,
- s->color->f_green,
- s->color->f_blue);
+ s->color->red,
+ s->color->green,
+ s->color->blue);
dt = et - bt;
first = 1;
noinst_LIBRARIES = libpsensor.a
libpsensor_a_SOURCES = \
- amd.h \
- bool.h \
- color.h color.c \
- cpu.h \
+ amd.h\
+ bool.h\
+ color.h color.c\
+ cpu.h\
hdd.h hdd_hddtemp.c\
- lmsensor.h lmsensor.c \
- plog.h plog.c \
+ lmsensor.h lmsensor.c\
measure.h measure.c \
- ptime.h ptime.c \
- nvidia.h \
+ nvidia.h\
+ plog.h plog.c\
+ pmutex.h pmutex.c\
psensor.h psensor.c\
- pio.h pio.c \
- slog.c slog.h \
+ ptime.h ptime.c\
+ pio.h pio.c\
+ slog.c slog.h\
+ temperature.c temperature.h\
url.c url.h
AM_CPPFLAGS = -Wall -Werror
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ 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; \
- test $$am__dry = yes; \
- }
+ 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@
@JSON_TRUE@am__append_12 = $(JSON_LIBS)
@JSON_TRUE@am__append_13 = $(JSON_CFLAGS)
subdir = src/lib
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
+AM_V_AR = $(am__v_AR_@AM_V@)
+am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
+am__v_AR_0 = @echo " AR " $@;
+am__v_AR_1 =
libpsensor_a_AR = $(AR) $(ARFLAGS)
libpsensor_a_LIBADD =
am__libpsensor_a_SOURCES_DIST = amd.h bool.h color.h color.c cpu.h \
- hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c plog.h plog.c \
- measure.h measure.c ptime.h ptime.c nvidia.h psensor.h \
- psensor.c pio.h pio.c slog.c slog.h url.c url.h hdd_atasmart.c \
- nvidia.c amd.c cpu.c psensor_json.h psensor_json.c
+ hdd.h hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \
+ nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
+ ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \
+ temperature.h url.c url.h hdd_atasmart.c nvidia.c amd.c cpu.c \
+ psensor_json.h psensor_json.c
@ATASMART_TRUE@am__objects_1 = hdd_atasmart.$(OBJEXT)
@NVIDIA_TRUE@am__objects_2 = nvidia.$(OBJEXT)
@LIBATIADL_TRUE@am__objects_3 = amd.$(OBJEXT)
@GTOP_TRUE@am__objects_4 = cpu.$(OBJEXT)
@JSON_TRUE@am__objects_5 = psensor_json.$(OBJEXT)
am_libpsensor_a_OBJECTS = color.$(OBJEXT) hdd_hddtemp.$(OBJEXT) \
- lmsensor.$(OBJEXT) plog.$(OBJEXT) measure.$(OBJEXT) \
- ptime.$(OBJEXT) psensor.$(OBJEXT) pio.$(OBJEXT) slog.$(OBJEXT) \
+ lmsensor.$(OBJEXT) measure.$(OBJEXT) plog.$(OBJEXT) \
+ pmutex.$(OBJEXT) psensor.$(OBJEXT) ptime.$(OBJEXT) \
+ pio.$(OBJEXT) slog.$(OBJEXT) temperature.$(OBJEXT) \
url.$(OBJEXT) $(am__objects_1) $(am__objects_2) \
$(am__objects_3) $(am__objects_4) $(am__objects_5)
libpsensor_a_OBJECTS = $(am_libpsensor_a_OBJECTS)
+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 = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(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_CC_1 =
CCLD = $(CC)
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_CCLD_1 =
SOURCES = $(libpsensor_a_SOURCES)
DIST_SOURCES = $(am__libpsensor_a_SOURCES_DIST)
am__can_run_installinfo = \
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)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libpsensor.a
libpsensor_a_SOURCES = amd.h bool.h color.h color.c cpu.h hdd.h \
- hdd_hddtemp.c lmsensor.h lmsensor.c plog.h plog.c measure.h \
- measure.c ptime.h ptime.c nvidia.h psensor.h psensor.c pio.h \
- pio.c slog.c slog.h url.c url.h $(am__append_1) \
- $(am__append_4) $(am__append_7) $(am__append_8) \
- $(am__append_11)
+ hdd_hddtemp.c lmsensor.h lmsensor.c measure.h measure.c \
+ nvidia.h plog.h plog.c pmutex.h pmutex.c psensor.h psensor.c \
+ ptime.h ptime.c pio.h pio.c slog.c slog.h temperature.c \
+ temperature.h url.c url.h $(am__append_1) $(am__append_4) \
+ $(am__append_7) $(am__append_8) $(am__append_11)
AM_CPPFLAGS = -Wall -Werror $(am__append_3) $(am__append_6) \
$(am__append_10) $(am__append_13)
EXTRA_DIST = $(libpsensor_a_SOURCES) \
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
libpsensor.a: $(libpsensor_a_OBJECTS) $(libpsensor_a_DEPENDENCIES) $(EXTRA_libpsensor_a_DEPENDENCIES)
- -rm -f libpsensor.a
- $(libpsensor_a_AR) libpsensor.a $(libpsensor_a_OBJECTS) $(libpsensor_a_LIBADD)
- $(RANLIB) libpsensor.a
+ $(AM_V_at)-rm -f libpsensor.a
+ $(AM_V_AR)$(libpsensor_a_AR) libpsensor.a $(libpsensor_a_OBJECTS) $(libpsensor_a_LIBADD)
+ $(AM_V_at)$(RANLIB) libpsensor.a
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nvidia.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pio.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pmutex.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/psensor_json.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptime.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/temperature.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-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)
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+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; \
$$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
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
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-noinstLIBRARIES ctags distclean distclean-compile \
- distclean-generic 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 maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+ clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
+ distclean-compile distclean-generic 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 maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
#include "color.h"
-void color_set(struct color *color,
- unsigned int red,
- unsigned int green,
- unsigned int blue)
+void color_set(struct color *c, double r, double g, double b)
{
- color->red = red;
- color->green = green;
- color->blue = blue;
-
- color->f_red = ((double)color->red) / 65535;
- color->f_green = ((double)color->green) / 65535;
- color->f_blue = ((double)color->blue) / 65535;
+ c->red = r;
+ c->green = g;
+ c->blue = b;
}
-struct color *color_new(unsigned int red, unsigned int green, unsigned int blue)
+struct color *color_new(double r, double g, double b)
{
- struct color *color = malloc(sizeof(struct color));
+ struct color *color;
+
+ color = malloc(sizeof(struct color));
- color_set(color, red, green, blue);
+ color_set(color, r, g, b);
return color;
}
tmp[4] = '\0';
blue = strtol(tmp, NULL, 16);
- return color_new(red, green, blue);
+ return color_new(((double)red)/65535,
+ ((double)green)/65535,
+ ((double)blue)/65535);
}
char *color_to_str(const struct color *color)
{
char *str = malloc(1 + 12 + 1);
- sprintf(str, "#%.4x%.4x%.4x", color->red, color->green, color->blue);
+ sprintf(str, "#%.4x%.4x%.4x",
+ (int)(65535 * color->red),
+ (int)(65535 * color->green),
+ (int)(65535 * color->blue));
return str;
}
#ifndef _PSENSOR_COLOR_H_
#define _PSENSOR_COLOR_H_
-/*
- * Represents a RGB color.
- *
- * Contains integer and floating RGB representation to avoid useless
- * conversion.
- *
- * Uses color_set to maintain the coherence of the both
- * representation.
- */
+/* Represents a RGB color. */
struct color {
- /* rgb 0..65535 */
- unsigned int red;
- unsigned int green;
- unsigned int blue;
-
/* rgb floating 0..1 */
- double f_red;
- double f_green;
- double f_blue;
+ double red;
+ double green;
+ double blue;
};
-struct color *
-color_new(unsigned int red, unsigned int green, unsigned int blue);
+/** rgb 0..1 */
+struct color *color_new(double r, double g, double b);
struct color *color_dup(struct color *);
-void color_set(struct color *,
- unsigned int red,
- unsigned int green,
- unsigned int blue);
+/** rgb 0..1 */
+void color_set(struct color *, double r, double g, double b);
int is_color(const char *str);
#ifndef _P_IO_H
#define _P_IO_H
-#define P_IO_VER 3
+#define P_IO_VER 4
/* Returns '1' if a given 'path' denotates a directory else returns
0 */
--- /dev/null
+/*
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * 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 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <stdio.h>
+
+#include <plog.h>
+#include <pmutex.h>
+
+int pmutex_lock(pthread_mutex_t *m)
+{
+ int ret;
+
+ ret = pthread_mutex_lock(m);
+
+ if (ret)
+ log_err("pmutex_lock: %p %d", m, ret);
+
+ return ret;
+}
+
+int pmutex_unlock(pthread_mutex_t *m)
+{
+ int ret;
+
+ ret = pthread_mutex_unlock(m);
+
+ if (ret)
+ log_err("pmutex_unlock: %p %d", m, ret);
+
+ return ret;
+}
+
+int pmutex_init(pthread_mutex_t *m)
+{
+ pthread_mutexattr_t attr;
+ int ret;
+
+ pthread_mutexattr_init(&attr);
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+
+ ret = pthread_mutex_init(m, &attr);
+
+ if (ret)
+ log_err("pmutex_init: %p %d", m, ret);
+
+ return ret;
+}
--- /dev/null
+/*
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * 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 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#ifndef _P_PMUTEX_H_
+#define _P_PMUTEX_H_
+
+#include <pthread.h>
+
+int pmutex_lock(pthread_mutex_t *);
+int pmutex_unlock(pthread_mutex_t *);
+int pmutex_init(pthread_mutex_t *);
+
+#endif
#include <libintl.h>
#define _(str) gettext(str)
-#include "hdd.h"
-#include "psensor.h"
-#include "lmsensor.h"
+#include <hdd.h>
+#include <psensor.h>
+#include <lmsensor.h>
+#include <temperature.h>
#ifdef HAVE_GTOP
#include "cpu.h"
return type & SENSOR_TYPE_FAN;
}
-double celsius_to_fahrenheit(double c)
-{
- return c * (9.0/5.0) + 32;
-}
-
-double fahrenheit_to_celsius(double f)
-{
- return (f - 32) * (5.0/9.0);
-}
-
char *
psensor_value_to_str(unsigned int type, double value, int use_celsius)
{
double get_max_value(struct psensor **sensors, int type);
-double celsius_to_fahrenheit(double c);
-double fahrenheit_to_celsius(double c);
-
char *psensor_current_value_to_str(const struct psensor *, unsigned int);
void psensor_log_measures(struct psensor **sensors);
#include "bool.h"
#include "config.h"
#include <plog.h>
+#include <pmutex.h>
#include "ptime.h"
#include "slog.h"
bool first_call;
if (!file) {
- log_err(_("Sensor log file not open."));
+ log_debug(_("Sensor log file not open."));
return ;
}
{
while (1) {
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
- pthread_mutex_lock(sensors_mutex);
+ pmutex_lock(sensors_mutex);
slog_write_sensors(sensors);
- pthread_mutex_unlock(sensors_mutex);
+ pmutex_unlock(sensors_mutex);
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
sleep(period);
}
--- /dev/null
+/*
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * 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 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#include <temperature.h>
+
+double celsius_to_fahrenheit(double c)
+{
+ return c * (9.0/5.0) + 32;
+}
+
+double fahrenheit_to_celsius(double f)
+{
+ return (f - 32) * (5.0/9.0);
+}
+
--- /dev/null
+/*
+ * Copyright (C) 2010-2014 jeanfi@gmail.com
+ *
+ * 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 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#ifndef _PSENSOR_TEMPERATURE_H_
+#define _PSENSOR_TEMPERATURE_H_
+
+double celsius_to_fahrenheit(double c);
+double fahrenheit_to_celsius(double c);
+
+#endif
#include "ui_color.h"
#include "lmsensor.h"
#include "notify_cmd.h"
+#include <pmutex.h>
#include "slog.h"
#include "ui_pref.h"
#include "ui_graph.h"
}
}
-static void update_measures(struct ui_psensor *ui)
+static void *update_measures(void *data)
{
struct psensor **sensors;
struct config *cfg;
int period;
+ struct ui_psensor *ui;
+ ui = (struct ui_psensor *)data;
cfg = ui->config;
while (1) {
- pthread_mutex_lock(&ui->sensors_mutex);
+ pmutex_lock(&ui->sensors_mutex);
sensors = ui->sensors;
if (!sensors)
- return;
+ pthread_exit(NULL);
update_psensor_values_size(sensors, cfg);
period = cfg->sensor_update_interval;
- pthread_mutex_unlock(&ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
sleep(period);
}
ret = TRUE;
cfg = ui->config;
- pthread_mutex_lock(&ui->sensors_mutex);
+ pmutex_lock(&ui->sensors_mutex);
graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
ret = FALSE;
}
- pthread_mutex_unlock(&ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
/* number of uniq colors */
#define COLORS_COUNT 8
- unsigned int colors[COLORS_COUNT][3] = {
- {0x0000, 0x0000, 0x0000}, /* black */
- {0xffff, 0x0000, 0x0000}, /* red */
- {0x0000, 0x0000, 0xffff}, /* blue */
- {0x0000, 0xffff, 0x0000}, /* green */
+ double colors[COLORS_COUNT][3] = {
+ {0, 0, 0}, /* black */
+ {1, 0, 0}, /* red */
+ {0, 0, 1}, /* blue */
+ {0, 1, 0}, /* green */
- {0x7fff, 0x7fff, 0x7fff}, /* grey */
- {0x7fff, 0x0000, 0x0000}, /* dark red */
- {0x0000, 0x0000, 0x7fff}, /* dark blue */
- {0x0000, 0x7fff, 0x0000} /* dark green */
+ {0.5, 0.5, 0.5},/* grey */
+ {0.5, 0, 0}, /* dark red */
+ {0, 0, 0.5}, /* dark blue */
+ {0, 0.5, 0} /* dark green */
};
struct psensor **cur;
int i;
char *n;
struct psensor *s = *sensor_cur;
- s->graph_enabled = config_is_sensor_enabled(s->id);
+ s->graph_enabled = config_is_sensor_graph_enabled(s->id);
n = config_get_sensor_name(s->id);
static void log_init()
{
- char *home, *path, *dir;
+ const char *dir;
+ char *path;
- home = getenv("HOME");
+ dir = get_psensor_user_dir();
- if (!home)
+ if (!dir)
return ;
- dir = malloc(strlen(home)+1+strlen(".psensor")+1);
- sprintf(dir, "%s/%s", home, ".psensor");
- mkdir(dir, 0777);
-
path = malloc(strlen(dir)+1+strlen("log")+1);
sprintf(path, "%s/%s", dir, "log");
log_open(path);
- free(dir);
free(path);
}
*/
static void cleanup(struct ui_psensor *ui)
{
- pthread_mutex_lock(&ui->sensors_mutex);
+ pmutex_lock(&ui->sensors_mutex);
log_debug("Cleanup...");
ui_status_cleanup();
- pthread_mutex_unlock(&ui->sensors_mutex);
+ pmutex_unlock(&ui->sensors_mutex);
config_cleanup();
int main(int argc, char **argv)
{
struct ui_psensor ui;
- GError *error;
- GThread *thread;
- int optc, cmdok, opti, use_libatasmart, new_instance;
+ pthread_t thread;
+ int optc, cmdok, opti, use_libatasmart, new_instance, ret;
char *url = NULL;
GApplication *app;
g_thread_init(NULL);
#endif
+#ifdef HAVE_APPINDICATOR_029
+ /* gdk_thread_enter/leave only used to workaround mutex bug
+ * of appindicator < 0.2.9, so do not call gdk_threads_init
+ * if useless. Calling this function leads to
+ * crash "Attempt to unlock mutex that was not locked" with
+ * GLib 2.41.2 (new checking) probably due to bugs in GTK
+ * itself.
+ */
gdk_threads_init();
+#endif
gtk_init(NULL, NULL);
- pthread_mutex_init(&ui.sensors_mutex, NULL);
+ pmutex_init(&ui.sensors_mutex);
ui.config = config_load();
ui_enable_alpha_channel(&ui);
- thread = g_thread_create((GThreadFunc) update_measures,
- &ui, TRUE, &error);
+ ret = pthread_create(&thread, NULL, update_measures, &ui);
- if (!thread)
- g_error_free(error);
+ if (ret)
+ log_err(_("Failed to create thread for monitoring sensors"));
ui.graph_update_interval = ui.config->graph_update_interval;
+ 1
+ strlen(s->id)
+ 1
+ + 1
+ strlen(v)
+ 1);
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1.
-.TH PSENSOR "1" "June 2014" "psensor 1.0.2" "User Commands"
+.TH PSENSOR "1" "September 2014" "psensor 1.1.1" "User Commands"
.SH NAME
psensor \- Temperature monitoring application
.SH SYNOPSIS
--- /dev/null
+<schemalist>
+ <schema id="psensor" path="/apps/psensor/">
+ <key name="graph-alpha-channel-enabled" type="b">
+ <default>false</default>
+ <summary>Whether the alpha channel is enabled</summary>
+ <description>Whether the alpha channel is enabled. Must be
+ enabled for changing the transparency of the background of the
+ graph window.</description>
+ </key>
+ <key name="graph-background-alpha" type="d">
+ <default>1</default>
+ <summary>The alpha value of the background of the graph
+ window</summary>
+ <description>The alpha value of the background of the graph
+ window. It must be a positive float between 0 and 1. '1' is the
+ maximum opacity.</description>
+ </key>
+ <key name="graph-background-color" type="s">
+ <default>'#e8f4e8f4a8f5'</default>
+ <summary>The color of the background of the graph
+ canvas</summary>
+ <description>The color of the background of the graph canvas as
+ a #rgb representation.</description>
+ </key>
+ <key name="graph-foreground-color" type="s">
+ <default>'#000000000000'</default>
+ <summary>The color of the foreground of the graph
+ canvas</summary>
+ <description>The color of the foreground of the graph canvas as
+ a #rgb representation.</description>
+ </key>
+ <key name="graph-monitoring-duration" type="i">
+ <default>10</default>
+ <summary>The monitoring duration of the graph</summary>
+ <description>The monitoring duration of the graph as minutes. It
+ must be greater than 1.</description>
+ </key>
+ <key name="graph-update-interval" type="i">
+ <default>2</default>
+ <summary>The interval between refreshs of the graph</summary>
+ <description>The interval between refreshs of the graph as
+ seconds. It must be greater than 1.</description>
+ </key>
+ <key name="interface-hide-on-startup" type="b">
+ <default>false</default>
+ <summary>Whether the graph window is hidden on startup</summary>
+ <description>Whether the graph window is hidden on startup. The
+ graph will be hidden only if the Ubuntu Application Indicator or
+ status icon support is available.</description>
+ </key>
+ <key name="interface-menu-bar-disabled" type="b">
+ <default>false</default>
+ <summary>Whether the menu of the graph window is
+ disabled</summary>
+ <description>Whether the menu of the graph window is
+ disabled</description>
+ </key>
+ <key name="interface-sensorlist-position" type="i">
+ <default>0</default>
+ <summary>Position of the sensor list in the graph
+ window</summary>
+ <description>Position of the sensor list in the graph
+ window. Possible values are 0 (right), 1 (left), 2 (top), 3
+ (bottom).</description>
+ </key>
+ <key name="interface-unity-launcher-count-disabled" type="b">
+ <default>false</default>
+ <summary>Whether the greatest temperature is displayed in Unity
+ launcher</summary>
+ <description>If set to 'true' the greatest temperature will be
+ displayed in the Unity launcher.</description>
+ </key>
+ <key name="interface-temperature-unit" type="i">
+ <default>0</default>
+ <summary>The displayed temperature unit</summary>
+ <description>The displayed temperature unit, '0' for Celsius,
+ '1' for Fahenrenheit.</description>
+ </key>
+ <key name="interface-window-decoration-disabled" type="b">
+ <default>false</default>
+ <summary>Whether the decoration of the window is
+ disabled</summary>
+ <description>Whether the decoration of the window is
+ disabled.</description>
+ </key>
+ <key name="interface-window-keep-below-enabled" type="b">
+ <default>false</default>
+ <summary>Whether the graph window is kept below all other
+ windows</summary>
+ <description>Whether the graph window is kept below all other
+ windows.</description>
+ </key>
+ <key name="interface-window-restore-enabled" type="b">
+ <default>false</default>
+ <summary>Whether the position and size of the graph window are
+ restored</summary>
+ <description>Whether the position and size of the graph window
+ are restored</description>
+ </key>
+ <key name="interface-window-divider-pos" type="i">
+ <default>0</default>
+ <summary>Position of the divider between the graph window and
+ the list of sensors</summary>
+ <description>Position of the divider between the graph window
+ and the list of sensors</description>
+ </key>
+ <key name="interface-window-w" type="i">
+ <default>800</default>
+ <summary>Width of the graph window</summary>
+ <description>Width of the graph window.</description>
+ </key>
+ <key name="interface-window-h" type="i">
+ <default>200</default>
+ <summary>Height of the graph window</summary>
+ <description>Height of the graph window.</description>
+ </key>
+ <key name="interface-window-x" type="i">
+ <default>100</default>
+ <summary>Horizontal position of the graph window</summary>
+ <description>Horizontal position of the graph
+ window.</description>
+ </key>
+ <key name="interface-window-y" type="i">
+ <default>100</default>
+ <summary>Vertical position of the graph window</summary>
+ <description>Vertical position of the graph
+ window.</description>
+ </key>
+ <key name="notif-script" type="s">
+ <default>''</default>
+ <summary>The script called when a notification is
+ raised.</summary>
+ <description>The script called when a notification is
+ raised.</description>
+ </key>
+ <key name="slog-enabled" type="b">
+ <default>false</default>
+ <summary>Whether the logging sensors is enabled.</summary>
+ <description>Whether the logging sensors is
+ enabled.</description>
+ </key>
+ <key name="slog-interval" type="i">
+ <default>300</default>
+ <summary>Interval of the logging of sensors.</summary>
+ <description>Interval of the logging of sensors in
+ seconds.</description>
+ </key>
+ <key name="sensor-update-interval" type="i">
+ <default>2</default>
+ <summary>Update interface of the sensor values</summary>
+ <description>Update interface of the sensor
+ values.</description>
+ </key>
+ </schema>
+</schemalist>
+++ /dev/null
-<!-- Copyright (C) 2012-2014 jeanfi@gmail.com -->
-
-<!-- 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 of the -->
-<!-- License, or (at your option) any later version. -->
-
-<!-- This program is distributed in the hope that it will be useful, but -->
-<!-- WITHOUT ANY WARRANTY; without even the implied warranty of -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
-<!-- General Public License for more details. -->
-
-<!-- You should have received a copy of the GNU General Public License -->
-<!-- along with this program; if not, write to the Free Software -->
-<!-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -->
-<!-- 02110-1301 USA -->
-<gconfschemafile>
- <schemalist>
- <!-- Graph settings -->
- <schema>
- <key>/schemas/apps/psensor/graph/alpha_channel_enabled</key>
- <applyto>/apps/psensor/graph/alpha_channel_enabled</applyto>
- <owner>psensor</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether the alpha channel is enabled</short>
- <long>
- Whether the alpha channel is enabled. Must be enabled for changing
- the transparency of the background of the graph window.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/graph/background_alpha</key>
- <applyto>/apps/psensor/graph/background_alpha</applyto>
- <owner>psensor</owner>
- <type>float</type>
- <default>1</default>
- <locale name="C">
- <short>The alpha value of the background of the graph window</short>
- <long>
- The alpha value of the background of the graph window. It must
- be a positive float between 0 and 1. '1' is the maximum opacity.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/graph/background_color</key>
- <applyto>/apps/psensor/graph/background_color</applyto>
- <owner>psensor</owner>
- <type>string</type>
- <default>#e8f4e8f4a8f5</default>
- <locale name="C">
- <short>The color of the background of the graph canvas</short>
- <long>
- The color of the background of the graph canvas as a #rgb
- representation.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/graph/foreground_color</key>
- <applyto>/apps/psensor/graph/foreground_color</applyto>
- <owner>psensor</owner>
- <type>string</type>
- <default>#000000000000</default>
- <locale name="C">
- <short>The color of the foreground of the graph canvas</short>
- <long>
- The color of the foreground of the graph canvas as a #rgb
- representation.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/graph/monitoring_duration</key>
- <applyto>/apps/psensor/graph/monitoring_duration</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <default>10</default>
- <locale name="C">
- <short>The monitoring duration of the graph</short>
- <long>
- The monitoring duration of the graph as minutes. It must
- be greater than 1.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/graph/update_interval</key>
- <applyto>/apps/psensor/graph/update_interval</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <default>1</default>
- <locale name="C">
- <short>The interval between refreshs of the graph</short>
- <long>
- The interval between refreshs of the graph as seconds. It
- must be greater than 1.
- </long>
- </locale>
- </schema>
-
- <!-- Inteface settings -->
-
- <schema>
- <key>/schemas/apps/psensor/interface/hide_on_startup</key>
- <applyto>/apps/psensor/interface/hide_on_startup</applyto>
- <owner>psensor</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether the graph window is hidden on startup</short>
- <long>
- Whether the graph window is hidden on startup. The graph
- will be hidden only if the Ubuntu Application Indicator or
- status icon support is available.
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/menu_bar_disabled</key>
- <applyto>/apps/psensor/interface/menu_bar_disabled</applyto>
- <owner>psensor</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether the menu of the graph window is disabled</short>
- <long>
- Whether the menu of the graph window is disabled
- </long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/sensorlist_position</key>
- <applyto>/apps/psensor/interface/sensorlist_position</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short>Position of the sensor list in the graph window</short>
- <long>Position of the sensor list in the graph
- window. Possible values are 0 (right), 1 (left), 2 (top), 3
- (bottom).</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/unity_launcher_count_disabled</key>
- <applyto>/apps/psensor/interface/unity_launcher_count_disabled</applyto>
- <owner>psensor</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether the greatest temperature is displayed in Unity
- launcher</short>
- <long>If set to 'true' the greatest temperature will be
- displayed in the Unity launcher.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/temperature_unit</key>
- <applyto>/apps/psensor/interface/temperature_unit</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short>The displayed temperature unit</short>
- <long>The displayed temperature unit, '0' for Celsius, '1' for Fahenrenheit.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_decoration_disabled</key>
- <applyto>/apps/psensor/interface/window_decoration_disabled</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short>Whether the decoration of the window is disabled</short>
- <long>Whether the decoration of the window is disabled.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_keep_below_enabled</key>
- <applyto>/apps/psensor/interface/window_keep_below_enabled</applyto>
- <owner>psensor</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether the graph window is kept below all other windows</short>
- <long>Whether the graph window is kept below all other windows.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_restore_enabled</key>
- <applyto>/apps/psensor/interface/window_restore_enabled</applyto>
- <owner>psensor</owner>
- <type>bool</type>
- <default>false</default>
- <locale name="C">
- <short>Whether the position and size of the graph window are restored</short>
- <long>Whether the position and size of the graph window are restored</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_divider_pos</key>
- <applyto>/apps/psensor/interface/window_divider_pos</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <locale name="C">
- <short>Position of the divider between the graph window and the list of sensors</short>
- <long>Position of the divider between the graph window and the list of sensors</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_w</key>
- <applyto>/apps/psensor/interface/window_w</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <locale name="C">
- <short>Width of the graph window</short>
- <long>Width of the graph window.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_h</key>
- <applyto>/apps/psensor/interface/window_h</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <locale name="C">
- <short>Height of the graph window</short>
- <long>Height of the graph window.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_x</key>
- <applyto>/apps/psensor/interface/window_x</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <locale name="C">
- <short>Horizontal position of the graph window</short>
- <long>Horizontal position of the graph window.</long>
- </locale>
- </schema>
-
- <schema>
- <key>/schemas/apps/psensor/interface/window_y</key>
- <applyto>/apps/psensor/interface/window_y</applyto>
- <owner>psensor</owner>
- <type>int</type>
- <locale name="C">
- <short>Vertical position of the graph window</short>
- <long>Vertical position of the graph window.</long>
- </locale>
- </schema>
-
- </schemalist>
-</gconfschemafile>
char *dir, *path;
dir = get_user_autostart_dir();
- path = path_append(dir, "psensor.desktop");
+ path = path_append(dir, PSENSOR_DESKTOP_FILE);
free(dir);
static const char *get_desktop_file()
{
- return DATADIR"/applications/psensor.desktop";
+ return DATADIR"/applications/"PSENSOR_DESKTOP_FILE;
}
static int is_file_exists(const char *path)
ret = is_user_desktop_autostarted(kfile);
else
ret = -1;
+ g_key_file_free(kfile);
}
- g_key_file_free(kfile);
}
free(user_desktop);
void pxdg_set_autostart(unsigned int enable)
{
- char *user_desktop;
+ char *user_desktop, *dir;
log_fct_enter();
log_fct("desktop file: %s", get_desktop_file());
if (enable) {
- if (!is_file_exists(user_desktop))
+ if (!is_file_exists(user_desktop)) {
+ dir = get_user_autostart_dir();
+ mkdirs(dir, 0700);
+ free(dir);
file_copy(get_desktop_file(), user_desktop);
+ }
enable_gnome_autostart(user_desktop);
} else {
/* because X-GNOME-Autostart-enabled does not turn off
if (obj && !is_error(obj)) {
json_object *om;
- om = json_object_object_get(obj, "last_measure");
+ json_object_object_get_ex(obj, "last_measure", &om);
if (!is_error(obj)) {
json_object *ov, *ot;
struct timeval tv;
- ov = json_object_object_get(om, "value");
- ot = json_object_object_get(om, "time");
+ json_object_object_get_ex(om, "value", &ov);
+ json_object_object_get_ex(om, "time", &ot);
tv.tv_sec = json_object_get_int(ot);
tv.tv_usec = 0;
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
@ATASMART_TRUE@am__append_4 = $(ATASMART_CFLAGS)
@ATASMART_TRUE@am__append_5 = $(ATASMART_LIBS)
subdir = src/server
-DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp $(dist_man_MANS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
am_psensor_server_OBJECTS = server.$(OBJEXT) $(am__objects_1)
psensor_server_OBJECTS = $(am_psensor_server_OBJECTS)
psensor_server_LDADD = $(LDADD)
+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 = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(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_CC_1 =
CCLD = $(CC)
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_CCLD_1 =
SOURCES = $(psensor_server_SOURCES)
DIST_SOURCES = $(am__psensor_server_SOURCES_DIST)
am__can_run_installinfo = \
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(dist_man_MANS)
+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)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
fi; \
for p in $$list; do echo "$$p $$p"; done | \
sed 's/$(EXEEXT)$$//' | \
- while read p p1; do if test -f $$p; \
- then echo "$$p"; echo "$$p"; else :; fi; \
+ while read p p1; do if test -f $$p \
+ ; 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 } \
@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
clean-binPROGRAMS:
-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
psensor-server$(EXEEXT): $(psensor_server_OBJECTS) $(psensor_server_DEPENDENCIES) $(EXTRA_psensor_server_DEPENDENCIES)
@rm -f psensor-server$(EXEEXT)
- $(LINK) $(psensor_server_OBJECTS) $(psensor_server_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(psensor_server_OBJECTS) $(psensor_server_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sysinfo.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
install-man1: $(dist_man_MANS)
@$(NORMAL_INSTALL)
@list1=''; \
-e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
dir='$(DESTDIR)$(man1dir)'; $(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; \
$$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
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
distdir: $(DISTFILES)
- @list='$(MANS)'; if test -n "$$list"; then \
- list=`for p in $$list; do \
- if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
- if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
- if test -n "$$list" && \
- grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
- echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
- grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
- echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
- echo " typically \`make maintainer-clean' will remove them" >&2; \
- exit 1; \
- else :; fi; \
- else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
.MAKE: install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
- clean-generic ctags distclean distclean-compile \
- distclean-generic 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-man1 \
- 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 pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-binPROGRAMS \
- uninstall-man uninstall-man1
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+ clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+ distclean distclean-compile distclean-generic 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-man1 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 pdf pdf-am \
+ ps ps-am tags tags-am uninstall uninstall-am \
+ uninstall-binPROGRAMS uninstall-man uninstall-man1
psensor-server.1: server.c $(top_srcdir)/configure.ac
$(MAKE) $(AM_MAKEFLAGS) psensor-server$(EXEEXT)
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.44.1.
-.TH PSENSOR-SERVER "1" "June 2014" "psensor-server 1.0.2" "User Commands"
+.TH PSENSOR-SERVER "1" "September 2014" "psensor-server 1.1.1" "User Commands"
.SH NAME
psensor-server \- Temperature and system monitoring Web server
.SH SYNOPSIS
#include <plog.h>
#include "psensor_json.h"
+#include <pmutex.h>
#include "url.h"
#include "server.h"
#include "slog.h"
static struct server_data server_data;
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t mutex;
static int server_stop_requested;
nurl = url_normalize(url);
- pthread_mutex_lock(&mutex);
+ pmutex_lock(&mutex);
response = create_response(nurl, method, &resp_code);
- pthread_mutex_unlock(&mutex);
+ pmutex_unlock(&mutex);
ret = MHD_queue_response(connection, resp_code, response);
MHD_destroy_response(response);
if (!log_file)
log_file = strdup(DEFAULT_LOG_FILE);
+ pmutex_init(&mutex);
+
log_open(log_file);
psensor_init();
}
while (!server_stop_requested) {
- pthread_mutex_lock(&mutex);
+ pmutex_lock(&mutex);
#ifdef HAVE_GTOP
sysinfo_update(&server_data.psysinfo);
psensor_log_measures(server_data.sensors);
- pthread_mutex_unlock(&mutex);
+ pmutex_unlock(&mutex);
sleep(5);
}
}
}
-static void
-slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer data)
+static void slog_enabled_cbk(void *data)
{
struct ui_psensor *ui;
struct psensor **sensors;
cfg->window_x,
cfg->window_y);
- config_slog_enabled_notify_add(slog_enabled_cbk, ui);
+ config_set_slog_enabled_changed_cbk(slog_enabled_cbk, ui);
gtk_window_set_default_size(GTK_WINDOW(window),
cfg->window_w,
else
b = color.blue;
- color_set(col, 65535*r, 65535*g, 65535*b);
+ color_set(col, r, g, b);
}
gtk_widget_destroy(GTK_WIDGET(colordlg));
#include <stdlib.h>
#include <string.h>
-#include "ui.h"
-#include "cfg.h"
-#include "ui_pref.h"
-#include "ui_color.h"
+#include <ui.h>
+#include <cfg.h>
+#include <ui_pref.h>
+#include <ui_color.h>
#include <pxdg.h>
-GdkColor *color_to_gdkcolor(struct color *color)
+GdkRGBA color_to_GdkRGBA(struct color *color)
{
- GdkColor *c = malloc(sizeof(GdkColor));
+ GdkRGBA c;
- c->red = color->red;
- c->green = color->green;
- c->blue = color->blue;
+ c.red = color->red;
+ c.green = color->green;
+ c.blue = color->blue;
+ c.alpha = 1.0;
return c;
}
GtkBuilder *builder;
guint ok;
GError *error = NULL;
- GdkColor *color_fg, *color_bg;
- GtkColorButton *w_color_fg, *w_color_bg;
+ GdkRGBA color_fg, color_bg;
+ GtkColorChooser *w_color_fg, *w_color_bg;
GtkScale *w_bg_opacity;
GtkSpinButton *w_update_interval, *w_monitoring_duration,
*w_s_update_interval, *w_slog_interval;
free(notif_script);
}
- color_fg = color_to_gdkcolor(cfg->graph_fgcolor);
- w_color_fg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
- "color_fg"));
- gtk_color_button_set_color(w_color_fg, color_fg);
+ color_fg = color_to_GdkRGBA(cfg->graph_fgcolor);
+ w_color_fg = GTK_COLOR_CHOOSER(gtk_builder_get_object(builder,
+ "color_fg"));
+ gtk_color_chooser_set_rgba(w_color_fg, &color_fg);
- color_bg = color_to_gdkcolor(cfg->graph_bgcolor);
- w_color_bg = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
+ color_bg = color_to_GdkRGBA(cfg->graph_bgcolor);
+ w_color_bg = GTK_COLOR_CHOOSER(gtk_builder_get_object(builder,
"color_bg"));
- gtk_color_button_set_color(w_color_bg, color_bg);
+ gtk_color_chooser_set_rgba(w_color_bg, &color_bg);
w_bg_opacity = GTK_SCALE(gtk_builder_get_object(builder,
"bg_opacity"));
if (result == GTK_RESPONSE_ACCEPT) {
double value;
- GdkColor color;
+ GdkRGBA color;
pthread_mutex_lock(&ui->sensors_mutex);
config_set_notif_script
(gtk_entry_get_text(GTK_ENTRY(w_notif_script)));
- gtk_color_button_get_color(w_color_fg, &color);
+ gtk_color_chooser_get_rgba(w_color_fg, &color);
color_set(cfg->graph_fgcolor,
- color.red, color.green, color.blue);
+ color.red,
+ color.green,
+ color.blue);
- gtk_color_button_get_color(w_color_bg, &color);
+ gtk_color_chooser_get_rgba(w_color_bg, &color);
color_set(cfg->graph_bgcolor,
- color.red, color.green, color.blue);
+ color.red,
+ color.green,
+ color.blue);
value = gtk_range_get_value(GTK_RANGE(w_bg_opacity));
cfg->graph_bg_alpha = value;
#include "ui.h"
void ui_pref_dialog_run(struct ui_psensor *);
-GdkColor *color_to_gdkcolor(struct color *color);
+GdkRGBA color_to_GdkRGBA(struct color *color);
#endif
#include <stdlib.h>
#include <string.h>
-#include "ui.h"
-#include "ui_pref.h"
-#include "ui_sensorlist.h"
-#include "ui_sensorpref.h"
-#include "cfg.h"
-#include "ui_color.h"
+#include <cfg.h>
+#include <ui.h>
+#include <ui_color.h>
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_sensorpref.h>
enum {
COL_NAME = 0,
COL_TEMP_MAX,
COL_COLOR,
COL_COLOR_STR,
- COL_ENABLED,
+ COL_GRAPH_ENABLED,
COL_EMPTY,
COL_SENSOR,
+ COL_DISPLAY_ENABLED
};
struct cb_data {
static int col_index_to_col(int idx)
{
if (idx == 5)
- return COL_ENABLED;
+ return COL_GRAPH_ENABLED;
else if (idx > 5)
return -1;
{
GtkTreeIter iter;
GtkListStore *store;
- GdkColor color;
+ GdkRGBA color;
char *scolor;
struct psensor **ordered_sensors, **s_cur, *s;
+ unsigned int enabled;
ordered_sensors = ui_get_sensors_ordered_by_position(ui);
store = ui->sensors_store;
color.red = s->color->red;
color.green = s->color->green;
color.blue = s->color->blue;
+ color.alpha = 1.0;
- scolor = gdk_color_to_string(&color);
+ scolor = gdk_rgba_to_string(&color);
+
+ enabled = config_is_sensor_enabled(s->id);
gtk_list_store_set(store, &iter,
COL_NAME, s->name,
COL_COLOR_STR, scolor,
- COL_ENABLED, s->graph_enabled,
+ COL_GRAPH_ENABLED, s->graph_enabled,
COL_SENSOR, s,
+ COL_DISPLAY_ENABLED, enabled,
-1);
free(scolor);
}
populate(ui);
model = gtk_tree_view_get_model(ui->sensors_tree);
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
+
store = ui->sensors_store;
use_celsius = ui->config->temperature_unit == CELSIUS;
GTK_WINDOW(ui->main_window))) {
ui_sensorlist_update(ui, 1);
config_set_sensor_color(s->id, s->color);
+ config_sync();
}
- } else if (coli >= 0 && coli != COL_ENABLED) {
+ } else if (coli >= 0 && coli != COL_GRAPH_ENABLED) {
menu = create_sensor_popup(ui, s);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
{
struct ui_psensor *ui;
- GtkTreeModel *model;
+ GtkTreeModel *model, *fmodel;
GtkTreeIter iter;
GtkTreePath *path;
- struct psensor *s;
+ struct psensor *s, *s2;
+ gboolean valid;
ui = (struct ui_psensor *)data;
- model = gtk_tree_view_get_model(ui->sensors_tree);
+ fmodel = gtk_tree_view_get_model(ui->sensors_tree);
+
path = gtk_tree_path_new_from_string(path_str);
- gtk_tree_model_get_iter(model, &iter, path);
+ gtk_tree_model_get_iter(fmodel, &iter, path);
- gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
+ gtk_tree_model_get(fmodel, &iter, COL_SENSOR, &s, -1);
s->graph_enabled ^= 1;
- config_set_sensor_enabled(s->id, s->graph_enabled);
-
- gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- COL_ENABLED, s->graph_enabled, -1);
+ config_set_sensor_graph_enabled(s->id, s->graph_enabled);
gtk_tree_path_free(path);
+
+ model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(fmodel));
+ valid = gtk_tree_model_get_iter_first(model, &iter);
+ while (valid) {
+ gtk_tree_model_get(model, &iter, COL_SENSOR, &s2, -1);
+
+ if (s == s2)
+ gtk_list_store_set(ui->sensors_store,
+ &iter,
+ COL_GRAPH_ENABLED,
+ s->graph_enabled,
+ -1);
+ valid = gtk_tree_model_iter_next(model, &iter);
+ }
}
void ui_sensorlist_create(struct ui_psensor *ui)
{
GtkCellRenderer *renderer;
+ GtkTreeModel *fmodel, *model;
log_debug("ui_sensorlist_create()");
+ model = gtk_tree_view_get_model(ui->sensors_tree);
+ fmodel = gtk_tree_model_filter_new(model, NULL);
+ gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(fmodel),
+ COL_DISPLAY_ENABLED);
+
+ gtk_tree_view_set_model(ui->sensors_tree, fmodel);
+
renderer = gtk_cell_renderer_text_new();
gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
-1,
-1,
_("Graph"),
renderer,
- "active", COL_ENABLED,
+ "active", COL_GRAPH_ENABLED,
NULL);
g_signal_connect(G_OBJECT(renderer),
"toggled", (GCallback) toggled_cbk, ui);
#include <gtk/gtk.h>
-#include "cfg.h"
-#include "ui_pref.h"
-#include "ui_sensorlist.h"
-#include "ui_sensorpref.h"
-#include "ui_color.h"
+#include <cfg.h>
+#include <temperature.h>
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_sensorpref.h>
+#include <ui_color.h>
+
#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
#include "ui_appindicator.h"
struct sensor_pref {
struct psensor *sensor;
char *name;
- int enabled;
+ int graph_enabled;
struct color *color;
int alarm_enabled;
int alarm_high_threshold;
int alarm_low_threshold;
unsigned int appindicator_enabled;
unsigned int appindicator_label_enabled;
+ unsigned int display_enabled;
};
struct cb_data {
p->sensor = s;
p->name = strdup(s->name);
- p->enabled = s->graph_enabled;
+ p->graph_enabled = s->graph_enabled;
p->alarm_enabled = s->alarm_enabled;
p->color = color_dup(s->color);
+ p->display_enabled = config_is_sensor_enabled(s->id);
if (cfg->temperature_unit == CELSIUS) {
p->alarm_high_threshold = s->alarm_high_threshold;
p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p)
- p->enabled = gtk_toggle_button_get_active(btn);
+ p->graph_enabled = gtk_toggle_button_get_active(btn);
+}
+
+void ui_sensorpref_display_toggled_cb(GtkToggleButton *btn, gpointer data)
+{
+ struct sensor_pref *p;
+
+ p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
+
+ if (p)
+ p->display_enabled = gtk_toggle_button_get_active(btn);
}
void ui_sensorpref_alarm_toggled_cb(GtkToggleButton *btn, gpointer data)
void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
{
struct sensor_pref *p;
- GdkColor color;
+ GdkRGBA color;
p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
if (p) {
- gtk_color_button_get_color(widget, &color);
+ gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color);
color_set(p->color, color.red, color.green, color.blue);
}
}
*w_chipname;
GtkEntry *w_name;
GtkToggleButton *w_draw, *w_alarm, *w_appindicator_enabled,
- *w_appindicator_label_enabled;
+ *w_appindicator_label_enabled, *w_display;
GtkColorButton *w_color;
GtkSpinButton *w_high_threshold, *w_low_threshold;
- GdkColor *color;
+ GdkRGBA color;
struct psensor *s;
int use_celsius;
w_draw = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
"sensor_draw"));
- gtk_toggle_button_set_active(w_draw, p->enabled);
+ gtk_toggle_button_set_active(w_draw, p->graph_enabled);
- color = color_to_gdkcolor(p->color);
+ w_display = GTK_TOGGLE_BUTTON(gtk_builder_get_object
+ (builder,
+ "sensor_enable_checkbox"));
+ gtk_toggle_button_set_active(w_display, p->display_enabled);
+
+ color = color_to_GdkRGBA(p->color);
w_color = GTK_COLOR_BUTTON(gtk_builder_get_object(builder,
"sensor_color"));
- gtk_color_button_set_color(w_color, color);
+ gtk_color_chooser_set_rgba(GTK_COLOR_CHOOSER(w_color), &color);
w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
"sensor_alarm"));
w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
(gtk_builder_get_object(builder, "indicator_label_checkbox"));
-
if (is_temp_type(s->type) || is_fan_type(s->type)) {
gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
gtk_spin_button_set_value(w_high_threshold,
config_set_sensor_name(s->id, s->name);
}
- if (s->graph_enabled != p->enabled) {
- s->graph_enabled = p->enabled;
- config_set_sensor_enabled(s->id, s->graph_enabled);
+ if (s->graph_enabled != p->graph_enabled) {
+ s->graph_enabled = p->graph_enabled;
+ config_set_sensor_graph_enabled(s->id, s->graph_enabled);
}
if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
config_set_sensor_alarm_enabled(s->id, s->alarm_enabled);
}
- color_set(s->color, p->color->red, p->color->green, p->color->blue);
+ color_set(s->color,
+ p->color->red,
+ p->color->green,
+ p->color->blue);
config_set_sensor_color(s->id, s->color);
if (s->appindicator_enabled != p->appindicator_enabled) {
p->appindicator_label_enabled);
config_set_sensor_position(s->id, pos);
+
+ config_set_sensor_enabled(s->id, p->display_enabled);
}
static void apply_prefs(GtkTreeModel *model, struct config *cfg)
valid = gtk_tree_model_iter_next(model, &iter);
i++;
}
+ config_sync();
}
void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
*/
#include <unity.h>
+#include <temperature.h>
#include <ui_unity.h>
static int initialized;
if (!initialized) {
psensor_entry = unity_launcher_entry_get_for_desktop_file
- ("psensor.desktop");
+ (PSENSOR_DESKTOP_FILE);
unity_launcher_entry_set_count(psensor_entry, 0);
initialized = 1;
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
test-url-normalize$(EXEEXT) $(am__append_3)
@CPPCHECK_TRUE@am__append_3 = test-cppcheck.sh
subdir = tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/depcomp $(top_srcdir)/test-driver
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
am_test_url_normalize_OBJECTS = test_url_normalize.$(OBJEXT)
test_url_normalize_OBJECTS = $(am_test_url_normalize_OBJECTS)
test_url_normalize_LDADD = $(LDADD)
+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 = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
+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 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(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_CC_1 =
CCLD = $(CC)
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_CCLD_1 =
SOURCES = $(test_io_dir_list_SOURCES) \
$(test_psensor_type_to_unit_str_SOURCES) \
$(test_psensor_value_to_str_SOURCES) \
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='\e[0;31m'; \
+ grn='\e[0;32m'; \
+ lgn='\e[1;32m'; \
+ blu='\e[1;34m'; \
+ mgn='\e[0;35m'; \
+ brg='\e[1m'; \
+ std='\e[m'; \
+ 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)/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)/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@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
all: all-am
.SUFFIXES:
-.SUFFIXES: .c .o .obj
+.SUFFIXES: .c .log .o .obj .test .test$(EXEEXT) .trs
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
clean-checkPROGRAMS:
-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+
test-io-dir-list$(EXEEXT): $(test_io_dir_list_OBJECTS) $(test_io_dir_list_DEPENDENCIES) $(EXTRA_test_io_dir_list_DEPENDENCIES)
@rm -f test-io-dir-list$(EXEEXT)
- $(LINK) $(test_io_dir_list_OBJECTS) $(test_io_dir_list_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(test_io_dir_list_OBJECTS) $(test_io_dir_list_LDADD) $(LIBS)
+
test-psensor-type-to-unit-str$(EXEEXT): $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_DEPENDENCIES) $(EXTRA_test_psensor_type_to_unit_str_DEPENDENCIES)
@rm -f test-psensor-type-to-unit-str$(EXEEXT)
- $(test_psensor_type_to_unit_str_LINK) $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(test_psensor_type_to_unit_str_LINK) $(test_psensor_type_to_unit_str_OBJECTS) $(test_psensor_type_to_unit_str_LDADD) $(LIBS)
+
test-psensor-value-to-str$(EXEEXT): $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_DEPENDENCIES) $(EXTRA_test_psensor_value_to_str_DEPENDENCIES)
@rm -f test-psensor-value-to-str$(EXEEXT)
- $(test_psensor_value_to_str_LINK) $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(test_psensor_value_to_str_LINK) $(test_psensor_value_to_str_OBJECTS) $(test_psensor_value_to_str_LDADD) $(LIBS)
+
test-url-encode$(EXEEXT): $(test_url_encode_OBJECTS) $(test_url_encode_DEPENDENCIES) $(EXTRA_test_url_encode_DEPENDENCIES)
@rm -f test-url-encode$(EXEEXT)
- $(LINK) $(test_url_encode_OBJECTS) $(test_url_encode_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(test_url_encode_OBJECTS) $(test_url_encode_LDADD) $(LIBS)
+
test-url-normalize$(EXEEXT): $(test_url_normalize_OBJECTS) $(test_url_normalize_DEPENDENCIES) $(EXTRA_test_url_normalize_DEPENDENCIES)
@rm -f test-url-normalize$(EXEEXT)
- $(LINK) $(test_url_normalize_OBJECTS) $(test_url_normalize_LDADD) $(LIBS)
+ $(AM_V_CCLD)$(LINK) $(test_url_normalize_OBJECTS) $(test_url_normalize_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_url_normalize.Po@am__quote@
.c.o:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c $<
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
-@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o: test_psensor_type_to_unit_str.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.o `test -f 'test_psensor_type_to_unit_str.c' || echo '$(srcdir)/'`test_psensor_type_to_unit_str.c
test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj: test_psensor_type_to_unit_str.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -MT test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Tpo $(DEPDIR)/test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_type_to_unit_str.c' object='test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi`
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_type_to_unit_str_CFLAGS) $(CFLAGS) -c -o test_psensor_type_to_unit_str-test_psensor_type_to_unit_str.obj `if test -f 'test_psensor_type_to_unit_str.c'; then $(CYGPATH_W) 'test_psensor_type_to_unit_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_type_to_unit_str.c'; fi`
test_psensor_value_to_str-test_psensor_value_to_str.o: test_psensor_value_to_str.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.o -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.o' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.o -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.o `test -f 'test_psensor_value_to_str.c' || echo '$(srcdir)/'`test_psensor_value_to_str.c
test_psensor_value_to_str-test_psensor_value_to_str.obj: test_psensor_value_to_str.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.obj' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -MT test_psensor_value_to_str-test_psensor_value_to_str.obj -MD -MP -MF $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Tpo $(DEPDIR)/test_psensor_value_to_str-test_psensor_value_to_str.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_psensor_value_to_str.c' object='test_psensor_value_to_str-test_psensor_value_to_str.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi`
-
-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)
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_psensor_value_to_str_CFLAGS) $(CFLAGS) -c -o test_psensor_value_to_str-test_psensor_value_to_str.obj `if test -f 'test_psensor_value_to_str.c'; then $(CYGPATH_W) 'test_psensor_value_to_str.c'; else $(CYGPATH_W) '$(srcdir)/test_psensor_value_to_str.c'; fi`
+
+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; \
$$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
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)
+ @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-io-dir-list.sh.log: test-io-dir-list.sh
+ @p='test-io-dir-list.sh'; \
+ b='test-io-dir-list.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)
+test-psensor-type-to-unit-str.log: test-psensor-type-to-unit-str$(EXEEXT)
+ @p='test-psensor-type-to-unit-str$(EXEEXT)'; \
+ b='test-psensor-type-to-unit-str'; \
+ $(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-psensor-value-to-str.log: test-psensor-value-to-str$(EXEEXT)
+ @p='test-psensor-value-to-str$(EXEEXT)'; \
+ b='test-psensor-value-to-str'; \
+ $(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-url-encode.log: test-url-encode$(EXEEXT)
+ @p='test-url-encode$(EXEEXT)'; \
+ b='test-url-encode'; \
+ $(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-url-normalize.log: test-url-normalize$(EXEEXT)
+ @p='test-url-normalize$(EXEEXT)'; \
+ b='test-url-normalize'; \
+ $(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-cppcheck.sh.log: test-cppcheck.sh
+ @p='test-cppcheck.sh'; \
+ b='test-cppcheck.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)
+.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'`; \
"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:
.MAKE: check-am install-am install-strip
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \
- clean clean-checkPROGRAMS clean-generic ctags distclean \
- distclean-compile distclean-generic 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 maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am \
+ check-local clean clean-checkPROGRAMS clean-generic \
+ cscopelist-am ctags ctags-am distclean distclean-compile \
+ distclean-generic 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 maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am
+ mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
+ uninstall uninstall-am
check-local: checkpatch.pl
find $(top_srcdir)/src -name \*.c -exec $(srcdir)/checkpatch.pl --ignore SPLIT_STRING --show-types -q --no-tree -emacs -f {} \;
-# Makefile.in generated by automake 1.11.6 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.
@SET_MAKE@
VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
+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 \
*\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
- test $$am__dry = yes; \
- }
+ 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@
build_triplet = @build@
host_triplet = @host@
subdir = www
-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)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
+ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \
+ $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+ $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \
+ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
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_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 = \
}
am__installdirs = "$(DESTDIR)$(defaultwwwdir)"
DATA = $(defaultwww_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@
APPINDICATOR_LIBS = @APPINDICATOR_LIBS@
AR = @AR@
+ASCIIDOC = @ASCIIDOC@
ATASMART_CFLAGS = @ATASMART_CFLAGS@
ATASMART_LIBS = @ATASMART_LIBS@
AUTOCONF = @AUTOCONF@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
GTOP_CFLAGS = @GTOP_CFLAGS@
POSUB = @POSUB@
PTHREAD_LIBS = @PTHREAD_LIBS@
RANLIB = @RANLIB@
-SED = @SED@
SENSORS_LIBS = @SENSORS_LIBS@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
XEXT_LIBS = @XEXT_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_015 = @XGETTEXT_015@
-XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@
XMKMF = @XMKMF@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@list='$(defaultwww_DATA)'; test -n "$(defaultwwwdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(defaultwwwdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-defaultwwwDATA 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-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am \
- uninstall-defaultwwwDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-defaultwwwDATA 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-generic pdf pdf-am ps ps-am tags-am uninstall \
+ uninstall-am uninstall-defaultwwwDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
projects / psensor-pkg-ubuntu.git / commitdiff