diff options
author | Oliver Kurth <oku@debian.org> | 2006-03-27 10:45:20 -0800 |
---|---|---|
committer | Andrew Shadura <andrew.shadura@collabora.co.uk> | 2016-06-21 11:57:26 +0200 |
commit | 1511a5d1810807c082bf817ba9faa7406187e058 (patch) | |
tree | ecd523458d96dd8d088ef241234d6dcf67979186 | |
parent | 49219547fe782877997711c3287f102b7ee35ad4 (diff) | |
parent | 7d32cbea18afba39c0048ecf63037e33ec56ee05 (diff) |
Imported Debian patch 0.28-1
44 files changed, 2319 insertions, 1433 deletions
diff --git a/Makefile.am b/Makefile.am index 600e429..86e92d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am 116 2004-12-19 00:24:29Z lennart $ +# $Id: Makefile.am 125 2005-06-04 19:44:24Z lennart $ # This file is part of ifplugd. # @@ -32,7 +32,7 @@ homepage: all dist mkdir -p $$HOME/homepage/private/projects/ifplugd cp ifplugd-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/ifplugd cp man/ifplugd.8.xml man/ifplugstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/README.html doc/style.css doc/NEWS $$HOME/homepage/private/projects/ifplugd - cp $$HOME/homepage/private/projects/ifplugd/README.html $$HOME/homepage/private/projects/ifplugd/index.html + ln -sf README.html $$HOME/homepage/private/projects/ifplugd/index.html distcleancheck: @: diff --git a/Makefile.in b/Makefile.in index 180d1b7..3b9e37a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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. @@ -14,7 +14,7 @@ @SET_MAKE@ -# $Id: Makefile.am 116 2004-12-19 00:24:29Z lennart $ +# $Id: Makefile.am 125 2005-06-04 19:44:24Z lennart $ # This file is part of ifplugd. # @@ -39,7 +39,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = . - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -53,6 +52,43 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +subdir = . +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/ifplugd.spec.in $(top_srcdir)/configure depcomp \ + install-sh missing mkinstalldirs +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(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 \ + configure.lineno configure.status.lineno +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = ifplugd.spec +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ + html-recursive info-recursive install-data-recursive \ + install-exec-recursive install-info-recursive \ + install-recursive installcheck-recursive installdirs-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + uninstall-recursive +DATA = $(noinst_DATA) +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -113,6 +149,7 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -120,6 +157,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -135,6 +174,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -142,49 +182,46 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - EXTRA_DIST = bootstrap.sh README LICENSE ifplugd.spec ifplugd.spec.in SUBDIRS = src man conf doc patches - MAINTAINERCLEANFILES = README ifplugd.spec noinst_DATA = README ifplugd.spec -subdir = . -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = ifplugd.spec -DIST_SOURCES = -DATA = $(noinst_DATA) - - -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive install-info-recursive uninstall-info-recursive \ - all-recursive install-data-recursive install-exec-recursive \ - installdirs-recursive install-recursive uninstall-recursive \ - check-recursive installcheck-recursive -DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure \ - Makefile.am aclocal.m4 config.h.in configure configure.ac \ - depcomp ifplugd.spec.in install-sh missing mkinstalldirs -DIST_SUBDIRS = $(SUBDIRS) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: - -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) - -$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) -$(ACLOCAL_M4): configure.ac +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) config.h: stamp-h1 @@ -196,14 +233,14 @@ config.h: stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h - -$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/config.h.in: $(am__configure_deps) cd $(top_srcdir) && $(AUTOHEADER) - touch $(srcdir)/config.h.in + rm -f stamp-h1 + touch $@ distclean-hdr: -rm -f config.h stamp-h1 -ifplugd.spec: $(top_builddir)/config.status ifplugd.spec.in +ifplugd.spec: $(top_builddir)/config.status $(srcdir)/ifplugd.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ uninstall-info-am: @@ -214,7 +251,13 @@ uninstall-info-am: # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @set fnord $$MAKEFLAGS; amf=$$2; \ + @failcom='exit 1'; \ + for f in x $$MAKEFLAGS; do \ + case $$f in \ + *=* | --[!k]*);; \ + *k*) failcom='fail=yes';; \ + esac; \ + done; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -226,7 +269,7 @@ $(RECURSIVE_TARGETS): local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ @@ -234,7 +277,13 @@ $(RECURSIVE_TARGETS): mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: - @set fnord $$MAKEFLAGS; amf=$$2; \ + @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)' ;; \ @@ -255,7 +304,7 @@ maintainer-clean-recursive: local_target="$$target"; \ fi; \ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ @@ -266,14 +315,6 @@ ctags-recursive: test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -282,19 +323,22 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { 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=; \ here=`pwd`; \ - if (etags --etags-include --version) >/dev/null 2>&1; then \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ + empty_fix=.; \ else \ include_option=--include; \ + empty_fix=; \ fi; \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && \ + test ! -f $$subdir/TAGS || \ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ @@ -304,10 +348,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -330,24 +375,11 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = . -distdir = $(PACKAGE)-$(VERSION) - -am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } - -GZIP_ENV = --best -distuninstallcheck_listfiles = find . -type f -print -distcleancheck_listfiles = find . -type f -print distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkinstalldirs) $(distdir)/. $(distdir)/doc + $(mkdir_p) $(distdir)/. $(distdir)/doc @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -359,7 +391,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -374,15 +406,17 @@ distdir: $(DISTFILES) || exit 1; \ fi; \ done - list='$(SUBDIRS)'; for subdir in $$list; do \ + list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ + test -d "$(distdir)/$$subdir" \ + || $(mkdir_p) "$(distdir)/$$subdir" \ || exit 1; \ + distdir=`$(am__cd) $(distdir) && pwd`; \ + top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ (cd $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" \ - distdir=../$(distdir)/$$subdir \ + top_distdir="$$top_distdir" \ + distdir="$$distdir/$$subdir" \ distdir) \ || exit 1; \ fi; \ @@ -393,19 +427,46 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) $(am__remove_distdir) dist dist-all: distdir - $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - $(am__remove_distdir) - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac chmod -R a-w $(distdir); chmod a+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst @@ -425,19 +486,20 @@ distcheck: dist distuninstallcheck \ && chmod -R a-w "$$dc_install_base" \ && ({ \ - (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ } || { rm -rf "$$dc_destdir"; exit 1; }) \ && rm -rf "$$dc_destdir" \ - && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ - && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck $(am__remove_distdir) - @echo "$(distdir).tar.gz is ready for distribution" | \ - sed 'h;s/./=/g;p;x;p;x' + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -452,7 +514,6 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -472,7 +533,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -491,6 +552,8 @@ dvi: dvi-recursive dvi-am: +html: html-recursive + info: info-recursive info-am: @@ -527,22 +590,20 @@ uninstall-am: uninstall-info-am uninstall-info: uninstall-info-recursive -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ - clean-generic clean-recursive ctags ctags-recursive dist \ - dist-all dist-gzip distcheck distclean distclean-generic \ - distclean-hdr distclean-recursive distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am dvi-recursive info \ - info-am info-recursive install install-am install-data \ - install-data-am install-data-recursive install-exec \ - install-exec-am install-exec-recursive install-info \ - install-info-am install-info-recursive install-man \ - install-recursive install-strip installcheck installcheck-am \ - installdirs installdirs-am installdirs-recursive \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \ - ps-recursive tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-info-recursive uninstall-recursive +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ + check-am clean clean-generic clean-recursive ctags \ + ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \ + dist-tarZ dist-zip distcheck distclean distclean-generic \ + distclean-hdr distclean-recursive distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic maintainer-clean-recursive \ + mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ + pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-info-am README: @@ -555,7 +616,7 @@ homepage: all dist mkdir -p $$HOME/homepage/private/projects/ifplugd cp ifplugd-@PACKAGE_VERSION@.tar.gz $$HOME/homepage/private/projects/ifplugd cp man/ifplugd.8.xml man/ifplugstatus.8.xml man/ifplugd.conf.5.xml man/xmltoman.css man/xmltoman.xsl man/xmltoman.dtd doc/README.html doc/style.css doc/NEWS $$HOME/homepage/private/projects/ifplugd - cp $$HOME/homepage/private/projects/ifplugd/README.html $$HOME/homepage/private/projects/ifplugd/index.html + ln -sf README.html $$HOME/homepage/private/projects/ifplugd/index.html distcleancheck: @: @@ -1,12 +1,12 @@ - ifplugd 0.26 + ifplugd 0.28 - Copyright 2002-2004 Lennart Poettering <mzvscyhtq (at) 0pointer (dot) + Copyright 2002-2005 Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de> * [1]License * [2]News * [3]Overview - * [4]Status + * [4]Current Status * [5]Documentation * [6]Requirements * [7]Installation @@ -31,14 +31,23 @@ License News + Sat Jun 4 2005: + + [10]Version 0.28 released, changes include: build fixes from Stefan + Seyfried. + + Wed Mar 30 2005: + + [11]Version 0.27 released, changes include: new option --no-startup. + Sun Dec 19 2004: - [10]Version 0.26 released, changes include: changed MII code for + [12]Version 0.26 released, changes include: changed MII code for better compatibility with some 3COM Boomerang cards. Mon May 10 2004: - [11]Version 0.25 released, changes include: Revert to more classic + [13]Version 0.25 released, changes include: Revert to more classic link checking support. The new checking order is: ETHTOOL, MII, WLAN, IFF. The obsolete API "PRIV" is no longer checked by the automatic API detection code. However, you may enable it forcibly by passing -m priv @@ -46,56 +55,56 @@ News Mon Apr 12 2004: - [12]Version 0.24 released, changes include: add IFF_RUNNING link check + [14]Version 0.24 released, changes include: add IFF_RUNNING link check support and make it the default. This might break some setups. You may workaround this by passing -m to the daemon for selecting a different API. Please report breakages! Wed Apr 7 2004: - [13]Version 0.23 released, changes include: don't make /dev/tty1 the + [15]Version 0.23 released, changes include: don't make /dev/tty1 the controlling TTY when beeping Tue Feb 10 2004: - [14]Version 0.22 released, changes include: rename ifstatus to + [16]Version 0.22 released, changes include: rename ifstatus to ifplugstatus due to namespace collision, minor fixes Mon Jan 26 2004: - [15]Version 0.21b released, added missing file. + [17]Version 0.21b released, added missing file. Mon Jan 26 2004: - [16]Version 0.21 released, changes include: better compatibility with + [18]Version 0.21 released, changes include: better compatibility with wireless devices, compatibility with newer kernels Sun Nov 9 2003: - [17]Version 0.20 released, changes include: fix wrong message, build + [19]Version 0.20 released, changes include: fix wrong message, build fix Mon Oct 20 2003: - [18]Version 0.19 released, changes include: New option - --wait-for-kill, this requires [19]libdaemon 0.3 + [20]Version 0.19 released, changes include: New option + --wait-for-kill, this requires [21]libdaemon 0.3 Fri Oct 17 2003: - [20]Version 0.18 released, changes include: Some bugs fixed + [22]Version 0.18 released, changes include: Some bugs fixed Fri Sep 13 2003: - [21]Version 0.17b released, changes include: typo and date fix + [23]Version 0.17b released, changes include: typo and date fix Fri Sep 13 2003: - [22]Version 0.17 released, changes include: documentation update, + [24]Version 0.17 released, changes include: documentation update, better support for multiple interfaces, gcc 2.95 build fix Thu Aug 13 2003: - [23]Version 0.16 released, changes include: RPM spec file added, build + [25]Version 0.16 released, changes include: RPM spec file added, build fixes, WLAN improvements (including compatibility with the upcoming waproamd, a WLAN roaming daemon), monitor mode for use in conjunction with PCMCIA devices, better support for multiple interface setups, @@ -103,13 +112,13 @@ News Thu July 10 2003: - [24]Version 0.15 released, changes include: bad umask fix, + [26]Version 0.15 released, changes include: bad umask fix, documentation update Mon July 7 2003: - [25]Version 0.14 released, changes include: autoconf usage, new - dependency [26]libdaemon, wireless LAN support, support for + [27]Version 0.14 released, changes include: autoconf usage, new + dependency [28]libdaemon, wireless LAN support, support for suspending/resuming, many fixes Overview @@ -139,21 +148,21 @@ Overview * Can be configured to ignore short "unplugged" periods (-d option) or short "plugged" periods(-u option) * Support for wireless networking. Whenever an association to an AP - is detected the network is configured. Have a look on [27]waproamd + is detected the network is configured. Have a look on [29]waproamd if you need a facility to configure WEP keys before AP associations succeed. * Compatibility mode for network devices which do not support cable detection (-F option) -Status +Current Status - Version 0.26 is stable and has all the sensible features its users + Version 0.28 is stable and has all the sensible features its users could think of. Documentation - Have a look on the man pages [28]ifplugd(8), [29]ifplugstatus(8), - [30]ifplugd.conf(5). (An XSLT capable browser is required) + Have a look on the man pages [30]ifplugd(8), [31]ifplugstatus(8), + [32]ifplugd.conf(5). (An XSLT capable browser is required) Configuration @@ -237,7 +246,7 @@ Documentation A: This is a bug in the 8139too driver 0.9.25 (at least) shipped with Linux 2.4.19, please upgrade to 8139too 0.9.26 (Linux 2.4.20 or seperately at - [31]http://www.sourceforge.net/projects/gkernel/). + [33]http://www.sourceforge.net/projects/gkernel/). 6. Q: There are already laptop-net's ifd and miid, why did you write your own daemon? A: laptop-net was too integrated with its profile system and @@ -247,8 +256,14 @@ Documentation disabled. I didn't know about miid when I wrote ifplugd, but in any case ifplugd is much better than miid. For a comparison of miid and ifplugd, have a look on - [32]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat + [34]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat merged=yes + 7. Q: I have two interfaces (e.g. WLAN and copper ethernet), both + controlled by ifplugd, and want to force the network traffic to go + over the faster one of them, in case both are available at the + same time. How can I do this? + A: A tool I wrote called [35]ifmetric might be exactly what you're + looking for. Requirements @@ -265,7 +280,7 @@ Requirements The machine used was a Medion 9580-F laptop with a Realtek 8139 network card and a PRISM1 PCMCIA wireless LAN card. - ifplugd needs [33]libdaemon. + ifplugd needs [36]libdaemon. Installation @@ -279,7 +294,7 @@ Installation for it. Extensive installation instructions for installation of ifplugd on - Fedora Core 1 are available at [34]Geoff Ericksson's web site. + Fedora Core 1 are available at [37]Geoff Ericksson's web site. Acknowledgements @@ -288,39 +303,41 @@ Acknowledgements Oliver Kurth for packaging ifplugd for Debian and ifplugd's manpage - Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David - Mitchell, Norbert Preining, Herbert Graeber for patches + Stefan Seyfried, Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. + Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for + patches Frederic Lepied for integrating ifplugd into Mandrake Linux Download The newest release is always available from - [35]http://0pointer.de/lennart/projects/ifplugd/ + [38]http://0pointer.de/lennart/projects/ifplugd/ - The current release is [36]0.26 + The current release is [39]0.28 - Get ifplugd's development sources from the [37]Subversion - [38]repository ([39]viewcvs): + Get ifplugd's development sources from the [40]Subversion + [41]repository ([42]viewcvs): svn checkout svn://seth.intheinter.net/ifplugd/trunk ifplugd - You may find an up to date Debian package of ifplugd on the [40]Debian + You may find an up to date Debian package of ifplugd on the [43]Debian package repository. - Packages for Mandrake Linux may be found in the Cooker distribution; - Gentoo packages are available as well; [41]SuSE packages are available - courtesy of Herbert Graeber. + ifplugd is nowadays included in many popular distributions (Mandrake, + Gentoo, Suse, Debian, Ubuntu); [44]Conectiva packages are available + courtesy of Gonzalo Nemmi. Fedora Core packages are available from + [45]Dag Wieers. If you want to be notified whenever I release a new version of this - software use the subscription feature of [42]Freshmeat. + software use the subscription feature of [46]Freshmeat. - New! There is a joint ifplugd and waproamd [43]mailing list available. + New! There is a joint ifplugd and waproamd [47]mailing list available. _________________________________________________________________ - Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, December 2004 + Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005 - $Id: README.html.in 117 2004-12-19 00:30:39Z lennart $ + $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $ References @@ -333,37 +350,41 @@ References 7. README#installation 8. README#acks 9. README#download - 10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz - 11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz - 12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz - 13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz - 14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz - 15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz - 16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz - 17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz - 18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz - 19. http://0pointer.de/lennart/projects/libdaemon/ - 20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz - 21. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz - 22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz - 23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz - 24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz - 25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz - 26. http://0pointer.de/lennart/projects/libdaemon/ - 27. http://0pointer.de/lennart/projects/waproamd/ - 28. http://0pointer.de/lennart/projects/ifplugd/ifplugd.8.xml - 29. http://0pointer.de/lennart/projects/ifplugd/ifplugstatus.8.xml - 30. http://0pointer.de/lennart/projects/ifplugd/ifplugd.conf.5.xml - 31. http://www.sourceforge.net/projects/gkernel/ - 32. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes - 33. http://0pointer.de/lennart/projects/libdaemon/ - 34. http://www.acmc.uq.edu.au/~gbe/linux/installation_of_ifplugd.html - 35. http://0pointer.de/lennart/projects/ifplugd/ - 36. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz - 37. http://subversion.tigris.org/ - 38. svn://seth.intheinter.net/ifplugd - 39. http://0pointer.de/cgi-bin/viewcvs.cgi/?root=ifplugd - 40. http://packages.debian.org/ifplugd - 41. http://packman.links2linux.de/ - 42. http://freshmeat.net/projects/ifplugd/ - 43. https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss + 10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz + 11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz + 12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz + 13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz + 14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz + 15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz + 16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz + 17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz + 18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz + 19. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz + 20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz + 21. http://0pointer.de/lennart/projects/libdaemon/ + 22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz + 23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz + 24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz + 25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz + 26. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz + 27. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz + 28. http://0pointer.de/lennart/projects/libdaemon/ + 29. http://0pointer.de/lennart/projects/waproamd/ + 30. http://0pointer.de/lennart/projects/ifplugd/ifplugd.8.xml + 31. http://0pointer.de/lennart/projects/ifplugd/ifplugstatus.8.xml + 32. http://0pointer.de/lennart/projects/ifplugd/ifplugd.conf.5.xml + 33. http://www.sourceforge.net/projects/gkernel/ + 34. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes + 35. http://0pointer.de/lennart/projects/ifmetric/ + 36. http://0pointer.de/lennart/projects/libdaemon/ + 37. http://www.acmc.uq.edu.au/~gbe/linux/installation_of_ifplugd.html + 38. http://0pointer.de/lennart/projects/ifplugd/ + 39. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz + 40. http://subversion.tigris.org/ + 41. svn://seth.intheinter.net/ifplugd + 42. http://0pointer.de/cgi-bin/viewcvs.cgi/?root=ifplugd + 43. http://packages.debian.org/ifplugd + 44. http://www.linuxdicas.com.ar/caleb/rpm + 45. http://dag.wieers.com/packages/ifplugd/ + 46. http://freshmeat.net/projects/ifplugd/ + 47. https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- +# generated automatically by aclocal 1.9.5 -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005 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. @@ -11,332 +11,147 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. - +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <scott@netsplit.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, 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. - +# 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., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 10 - -AC_PREREQ([2.54]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test "x$ac_cv_env_[]$1[]_set" = "xset"; then + pkg_cv_[]$1=$ac_cv_env_[]$1[]_value +elif test -n "$PKG_CONFIG"; then + if AC_RUN_LOG([$PKG_CONFIG --exists "$3" >/dev/null 2>&1]); then + pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG -# 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. +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.in +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_CACHE_CHECK([for $1][_CFLAGS], [pkg_cv_][$1][_CFLAGS], + [_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])]) +AC_CACHE_CHECK([for $1][_LIBS], [pkg_cv_][$1][_LIBS], + [_PKG_CONFIG([$1][_LIBS], [libs], [$2])]) + +if test $pkg_failed = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details.])], + [$4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# Copyright (C) 2002, 2003, 2005 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_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) +AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.9])]) - -# Helper functions for option handling. -*- Autoconf -*- + [AM_AUTOMAKE_VERSION([1.9.5])]) -# Copyright 2001, 2002 Free Software Foundation, Inc. +# AM_AUX_DIR_EXPAND -*- Autoconf -*- -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) - -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) - -# -# Check to make sure that the build environment is sane. +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # - -# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # 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 - - test "$[2]" = conftest.file - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -AC_MSG_RESULT(yes)]) - -# -*- Autoconf -*- - - -# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# serial 3 - -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) - - -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) - -# AM_AUX_DIR_EXPAND - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# 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. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to @@ -376,131 +191,55 @@ fi # absolute PATH. The drawback is that using absolute paths prevent a # configured tree to be moved without reconfiguration. -# Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50]) - -AC_DEFUN([AM_AUX_DIR_EXPAND], [ +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` ]) -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} -AC_SUBST(install_sh)]) - -# AM_PROG_INSTALL_STRIP - -# Copyright 2001 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# AM_CONDITIONAL -*- Autoconf -*- -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. - -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) -fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) - -# -*- Autoconf -*- -# Copyright (C) 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# 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 +# serial 7 -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. +# 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_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' else - am__leading_dot=_ + $1_TRUE='#' + $1_FALSE= fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# serial 5 -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# 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 8 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -509,7 +248,6 @@ AC_SUBST([am__leading_dot])]) # CC etc. in the Makefile, will ask for an AC_PROG_CC use... - # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. @@ -568,7 +306,9 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -596,9 +336,14 @@ AC_CACHE_CHECK([dependency style of $depcc], grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_$1_dependencies_compiler_type=$depmode break fi @@ -632,8 +377,8 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # ------------ AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors]) +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' @@ -642,26 +387,16 @@ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH]) ]) -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# Generate code to set up dependency tracking. -*- Autoconf -*- -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# 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 +#serial 3 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ @@ -680,27 +415,21 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], else continue fi - grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # 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 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + 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 # Make sure the directory exists. test -f "$dirpart/$file" && continue @@ -726,27 +455,165 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# Check to see how 'make' treats includes. -*- Autoconf -*- +# Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# serial 12 -# 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. +# 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. -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.58])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 +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_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 +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 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_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 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], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 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_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -789,105 +656,310 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# AM_CONDITIONAL -*- Autoconf -*- +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. +# serial 4 -# 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. +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. -# serial 5 +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) -AC_PREREQ(2.52) +# Copyright (C) 2003, 2004, 2005 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_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) -if $2; then - $1_TRUE= - $1_FALSE='#' +# AM_PROG_MKDIR_P +# --------------- +# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. +# +# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories +# created by `make install' are always world readable, even if the +# installer happens to have an overly restrictive umask (e.g. 077). +# This was a mistake. There are at least two reasons why we must not +# use `-m 0755': +# - it causes special bits like SGID to be ignored, +# - it may be too restrictive (some setups expect 775 directories). +# +# Do not use -m 0755 and let people choose whatever they expect by +# setting umask. +# +# We cannot accept any implementation of `mkdir' that recognizes `-p'. +# Some implementations (such as Solaris 8's) are not thread-safe: if a +# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' +# concurrently, both version can detect that a/ is missing, but only +# one can create it and the other will error out. Consequently we +# restrict ourselves to GNU make (using the --version option ensures +# this.) +AC_DEFUN([AM_PROG_MKDIR_P], +[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' else - $1_TRUE='#' - $1_FALSE= + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]) -fi])]) +AC_SUBST([mkdir_p])]) +# Helper functions for option handling. -*- Autoconf -*- -dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) -dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page -dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ - succeeded=no +# Copyright (C) 2001, 2002, 2003, 2005 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. - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi +# serial 3 - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - AC_MSG_CHECKING(for $2) - - if $PKG_CONFIG --exists "$2" ; then - AC_MSG_RESULT(yes) - succeeded=yes - - AC_MSG_CHECKING($1_CFLAGS) - $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` - AC_MSG_RESULT($$1_CFLAGS) - - AC_MSG_CHECKING($1_LIBS) - $1_LIBS=`$PKG_CONFIG --libs "$2"` - AC_MSG_RESULT($$1_LIBS) - else - $1_CFLAGS="" - $1_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - ifelse([$4], ,echo $$1_PKG_ERRORS,) - fi - - AC_SUBST($1_CFLAGS) - AC_SUBST($1_LIBS) - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - if test $succeeded = yes; then - ifelse([$3], , :, [$3]) - else - ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) - fi -]) +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# 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_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # 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 + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 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 +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 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'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# 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. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} 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. +_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 + + # 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]) + 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_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR diff --git a/conf/Makefile.in b/conf/Makefile.in index 57ff487..77d1fd0 100644 --- a/conf/Makefile.in +++ b/conf/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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. @@ -39,7 +39,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -53,6 +52,19 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +subdir = conf +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DATA = $(noinst_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -113,6 +125,7 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -120,6 +133,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -135,6 +150,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -142,31 +158,42 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - sysinitdir = @SYSINITDIR@ - noinst_DATA = ifplugd.init ifplugd.action ifplugd.conf - EXTRA_DIST = ifplugd.init.in ifplugd.action ifplugd.conf - CLEANFILES = ifplugd.init -subdir = conf -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DATA = $(noinst_DATA) - -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign conf/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign conf/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -174,10 +201,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -191,7 +214,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -209,7 +232,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: install: install-am install-exec: install-exec-am @@ -231,7 +253,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -248,6 +270,8 @@ dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -281,13 +305,14 @@ ps-am: uninstall-am: uninstall-info-am uninstall-local .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-data-local \ - install-exec install-exec-am install-info install-info-am \ - install-man install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \ - uninstall-am uninstall-info-am uninstall-local + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am uninstall uninstall-am uninstall-info-am \ + uninstall-local ifplugd.init: ifplugd.init.in Makefile diff --git a/config.guess b/config.guess index ad5281e..c38553d 100644 --- a/config.guess +++ b/config.guess @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-08-03' +timestamp='2006-02-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -106,7 +106,7 @@ set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -206,6 +206,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} exit ;; @@ -764,7 +767,12 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -772,6 +780,9 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS_NT-*:*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -779,8 +790,11 @@ EOF i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' + x86:Interix*:[345]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[345]*) + echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -851,7 +865,11 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) @@ -870,7 +888,11 @@ EOF #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) @@ -919,6 +941,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu exit ;; @@ -964,7 +989,7 @@ EOF LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun) LIBC=gnu #else LIBC=gnuaout @@ -974,7 +999,11 @@ EOF LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" test x"${LIBC}" != x && { echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit @@ -1185,7 +1214,6 @@ EOF *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} @@ -1264,6 +1292,9 @@ EOF i*86:skyos:*:*) echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2005-07-08' +timestamp='2006-02-23' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -119,8 +119,9 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -171,6 +172,10 @@ case $os in -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -187,6 +192,10 @@ case $os in # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -239,7 +248,7 @@ case $basic_machine in | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -257,8 +266,9 @@ case $basic_machine in | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | ms1 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ | or32 \ | pdp10 | pdp11 | pj | pjl \ @@ -286,6 +296,9 @@ case $basic_machine in ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -336,8 +349,9 @@ case $basic_machine in | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ - | ms1-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ @@ -696,6 +710,9 @@ case $basic_machine in basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -803,6 +820,12 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; @@ -859,6 +882,10 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -1174,21 +1201,23 @@ case $os in | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku*) + | -skyos* | -haiku* | -rdos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for ifplugd 0.26. +# Generated by GNU Autoconf 2.59 for ifplugd 0.28. # # Report bugs to <mzvscyhtq (at) 0pointer (dot) de>. # @@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='ifplugd' PACKAGE_TARNAME='ifplugd' -PACKAGE_VERSION='0.26' -PACKAGE_STRING='ifplugd 0.26' +PACKAGE_VERSION='0.28' +PACKAGE_STRING='ifplugd 0.28' PACKAGE_BUGREPORT='mzvscyhtq (at) 0pointer (dot) de' ac_unique_file="src/ifplugd.c" @@ -311,7 +311,7 @@ ac_includes_default="\ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot PACKAGE_URL CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S EGREP LIBOBJS PKG_CONFIG LIBDAEMON_CFLAGS LIBDAEMON_LIBS SYSINITDIR have_lynx USE_LYNX_TRUE USE_LYNX_FALSE have_xmltoman USE_XMLTOMAN_TRUE USE_XMLTOMAN_FALSE have_subversion USE_SUBVERSION_TRUE USE_SUBVERSION_FALSE LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar PACKAGE_URL CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP LN_S EGREP LIBOBJS PKG_CONFIG ac_pt_PKG_CONFIG LIBDAEMON_CFLAGS LIBDAEMON_LIBS SYSINITDIR have_lynx USE_LYNX_TRUE USE_LYNX_FALSE have_xmltoman USE_XMLTOMAN_TRUE USE_XMLTOMAN_FALSE have_subversion USE_SUBVERSION_TRUE USE_SUBVERSION_FALSE LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -780,6 +780,18 @@ ac_env_CPP_set=${CPP+set} ac_env_CPP_value=$CPP ac_cv_env_CPP_set=${CPP+set} ac_cv_env_CPP_value=$CPP +ac_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_env_PKG_CONFIG_value=$PKG_CONFIG +ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set} +ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG +ac_env_LIBDAEMON_CFLAGS_set=${LIBDAEMON_CFLAGS+set} +ac_env_LIBDAEMON_CFLAGS_value=$LIBDAEMON_CFLAGS +ac_cv_env_LIBDAEMON_CFLAGS_set=${LIBDAEMON_CFLAGS+set} +ac_cv_env_LIBDAEMON_CFLAGS_value=$LIBDAEMON_CFLAGS +ac_env_LIBDAEMON_LIBS_set=${LIBDAEMON_LIBS+set} +ac_env_LIBDAEMON_LIBS_value=$LIBDAEMON_LIBS +ac_cv_env_LIBDAEMON_LIBS_set=${LIBDAEMON_LIBS+set} +ac_cv_env_LIBDAEMON_LIBS_value=$LIBDAEMON_LIBS # # Report the --help message. @@ -788,7 +800,7 @@ if test "$ac_init_help" = "long"; then # 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 ifplugd 0.26 to adapt to many kinds of systems. +\`configure' configures ifplugd 0.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -850,15 +862,15 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ifplugd 0.26:";; + short | recursive ) echo "Configuration of ifplugd 0.28:";; esac cat <<\_ACEOF Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking Speeds up one-time builds - --enable-dependency-tracking Do not reject slow dependency extractors + --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors --disable-lynx Turn off lynx usage for documentation generation --disable-xmltoman Disable rebuilding of man pages with xmltoman --disable-subversion Disable rebuilding of svn-release.h @@ -879,6 +891,11 @@ Some influential environment variables: CC C compiler command CFLAGS C compiler flags CPP C preprocessor + PKG_CONFIG path to pkg-config utility + LIBDAEMON_CFLAGS + C compiler flags for LIBDAEMON, overriding pkg-config + LIBDAEMON_LIBS + linker flags for LIBDAEMON, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -979,7 +996,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -ifplugd configure 0.26 +ifplugd configure 0.28 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -993,7 +1010,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ifplugd $as_me 0.26, which was +It was created by ifplugd $as_me 0.28, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1332,7 +1349,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers config.h" -am__api_version="1.7" +am__api_version="1.9" ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do if test -f $ac_dir/install-sh; then @@ -1495,7 +1512,6 @@ _ACEOF program_transform_name=`echo $program_transform_name | sed -f conftest.sed` rm conftest.sed - # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -1509,6 +1525,39 @@ else echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) + # where $(somedir) is conditionally defined. However this is wrong + # for two reasons: + # 1. if the package is installed by a user who cannot write `.' + # make install will fail, + # 2. the above comment should most certainly read + # $(mkdir_p) $(DESTDIR)$(somedir) + # so it does not work when $(somedir) is undefined and + # $(DESTDIR) is not. + # To support the latter case, we have to write + # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), + # so the `.' trick is pointless. + mkdir_p='mkdir -p --' +else + # On NextStep and OpenStep, the `mkdir' command does not + # recognize any option. It will interpret all options as + # directories to create, and then abort because `.' already + # exists. + for d in ./-p ./--version; + do + test -d $d && rmdir $d + done + # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. + if test -f "$ac_aux_dir/mkinstalldirs"; then + mkdir_p='$(mkinstalldirs)' + else + mkdir_p='$(install_sh) -d' + fi +fi + for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -1587,7 +1636,7 @@ else fi rmdir .tst 2>/dev/null - # test to see if srcdir already configured +# test to see if srcdir already configured if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 @@ -1607,7 +1656,7 @@ fi # Define the identity of the package. PACKAGE='ifplugd' - VERSION='0.26' + VERSION='0.28' cat >>confdefs.h <<_ACEOF @@ -1635,9 +1684,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} - -AMTAR=${AMTAR-"${am_missing_run}tar"} - install_sh=${install_sh-"$am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user @@ -1730,6 +1776,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + @@ -2402,7 +2455,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -2430,9 +2485,14 @@ else grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CXX_dependencies_compiler_type=$depmode break fi @@ -3227,7 +3287,9 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - : > sub/conftst$i.h + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf @@ -3255,9 +3317,14 @@ else grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings - # (even with -Werror). So we grep stderr for any message - # that says an option was ignored. - if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else am_cv_CC_dependencies_compiler_type=$depmode break fi @@ -3644,12 +3711,12 @@ fi # If using GCC specify some additional parameters if test "x$GCC" = "xyes" ; then - CFLAGS="$CFLAGS -pipe -W -Wall -pedantic" + CFLAGS="$CFLAGS -pipe -W -Wall" cat >conftest.$ac_ext <<_ACEOF int main() {} _ACEOF - $CC -c conftest.c -std=c99 -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -std=c99 -Wno-unused-parameter" + $CC -c conftest.c -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -Wno-unused-parameter" rm -f conftest.o fi @@ -5818,11 +5885,11 @@ done - succeeded=no - if test -z "$PKG_CONFIG"; then - # Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 +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 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then @@ -5847,7 +5914,6 @@ do done done - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi @@ -5861,60 +5927,164 @@ else echo "${ECHO_T}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 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&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_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" - echo "*** to the full path to pkg-config." - echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." - else - PKG_CONFIG_MIN_VERSION=0.9.0 - if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for libdaemon >= 0.5 " >&5 -echo $ECHO_N "checking for libdaemon >= 0.5 ... $ECHO_C" >&6 + ;; +esac +fi +ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG - if $PKG_CONFIG --exists " libdaemon >= 0.5 " ; then - echo "$as_me:$LINENO: result: yes" >&5 +if test -n "$ac_pt_PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 +echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + PKG_CONFIG=$ac_pt_PKG_CONFIG +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi + +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 +echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - succeeded=yes - - echo "$as_me:$LINENO: checking LIBDAEMON_CFLAGS" >&5 -echo $ECHO_N "checking LIBDAEMON_CFLAGS... $ECHO_C" >&6 - LIBDAEMON_CFLAGS=`$PKG_CONFIG --cflags " libdaemon >= 0.5 "` - echo "$as_me:$LINENO: result: $LIBDAEMON_CFLAGS" >&5 -echo "${ECHO_T}$LIBDAEMON_CFLAGS" >&6 - - echo "$as_me:$LINENO: checking LIBDAEMON_LIBS" >&5 -echo $ECHO_N "checking LIBDAEMON_LIBS... $ECHO_C" >&6 - LIBDAEMON_LIBS=`$PKG_CONFIG --libs " libdaemon >= 0.5 "` - echo "$as_me:$LINENO: result: $LIBDAEMON_LIBS" >&5 -echo "${ECHO_T}$LIBDAEMON_LIBS" >&6 - else - LIBDAEMON_CFLAGS="" - LIBDAEMON_LIBS="" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - LIBDAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libdaemon >= 0.5 "` - echo $LIBDAEMON_PKG_ERRORS - fi - - - - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi + else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + PKG_CONFIG="" + fi - if test $succeeded = yes; then - : - else - { { echo "$as_me:$LINENO: error: Library requirements ( libdaemon >= 0.5 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 -echo "$as_me: error: Library requirements ( libdaemon >= 0.5 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} +fi + +pkg_failed=no +echo "$as_me:$LINENO: checking for LIBDAEMON_CFLAGS" >&5 +echo $ECHO_N "checking for LIBDAEMON_CFLAGS... $ECHO_C" >&6 +if test "${pkg_cv_LIBDAEMON_CFLAGS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_LIBDAEMON_CFLAGS_set" = "xset"; then + pkg_cv_LIBDAEMON_CFLAGS=$ac_cv_env_LIBDAEMON_CFLAGS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \" libdaemon >= 0.5 \" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists " libdaemon >= 0.5 " >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBDAEMON_CFLAGS=`$PKG_CONFIG --cflags " libdaemon >= 0.5 " 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_LIBDAEMON_CFLAGS" >&5 +echo "${ECHO_T}$pkg_cv_LIBDAEMON_CFLAGS" >&6 +echo "$as_me:$LINENO: checking for LIBDAEMON_LIBS" >&5 +echo $ECHO_N "checking for LIBDAEMON_LIBS... $ECHO_C" >&6 +if test "${pkg_cv_LIBDAEMON_LIBS+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$ac_cv_env_LIBDAEMON_LIBS_set" = "xset"; then + pkg_cv_LIBDAEMON_LIBS=$ac_cv_env_LIBDAEMON_LIBS_value +elif test -n "$PKG_CONFIG"; then + if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \" libdaemon >= 0.5 \" >/dev/null 2>&1") >&5 + ($PKG_CONFIG --exists " libdaemon >= 0.5 " >/dev/null 2>&1) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + pkg_cv_LIBDAEMON_LIBS=`$PKG_CONFIG --libs " libdaemon >= 0.5 " 2>/dev/null` + else + pkg_failed=yes + fi +else + pkg_failed=untried +fi +fi +echo "$as_me:$LINENO: result: $pkg_cv_LIBDAEMON_LIBS" >&5 +echo "${ECHO_T}$pkg_cv_LIBDAEMON_LIBS" >&6 + +if test $pkg_failed = yes; then + LIBDAEMON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " libdaemon >= 0.5 "` + # Put the nasty error message in config.log where it belongs + echo "$LIBDAEMON_PKG_ERRORS" 1>&5 + + { { echo "$as_me:$LINENO: error: Package requirements ( libdaemon >= 0.5 ) were not met. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively you may set the LIBDAEMON_CFLAGS and LIBDAEMON_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements ( libdaemon >= 0.5 ) were not met. +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively you may set the LIBDAEMON_CFLAGS and LIBDAEMON_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } - fi +elif test $pkg_failed = untried; then + { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. +Alternatively you may set the LIBDAEMON_CFLAGS and LIBDAEMON_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +See \`config.log' for more details." >&5 +echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively you may set the LIBDAEMON_CFLAGS and LIBDAEMON_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + LIBDAEMON_CFLAGS=$pkg_cv_LIBDAEMON_CFLAGS + LIBDAEMON_LIBS=$pkg_cv_LIBDAEMON_LIBS + : +fi @@ -6567,7 +6737,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by ifplugd $as_me 0.26, which was +This file was extended by ifplugd $as_me 0.28, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6630,7 +6800,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -ifplugd config.status 0.26 +ifplugd config.status 0.28 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -6846,14 +7016,17 @@ s,@AUTOCONF@,$AUTOCONF,;t t s,@AUTOMAKE@,$AUTOMAKE,;t t s,@AUTOHEADER@,$AUTOHEADER,;t t s,@MAKEINFO@,$MAKEINFO,;t t -s,@AMTAR@,$AMTAR,;t t s,@install_sh@,$install_sh,;t t s,@STRIP@,$STRIP,;t t s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t +s,@mkdir_p@,$mkdir_p,;t t s,@AWK@,$AWK,;t t s,@SET_MAKE@,$SET_MAKE,;t t s,@am__leading_dot@,$am__leading_dot,;t t +s,@AMTAR@,$AMTAR,;t t +s,@am__tar@,$am__tar,;t t +s,@am__untar@,$am__untar,;t t s,@PACKAGE_URL@,$PACKAGE_URL,;t t s,@CXX@,$CXX,;t t s,@CXXFLAGS@,$CXXFLAGS,;t t @@ -6882,6 +7055,7 @@ s,@LN_S@,$LN_S,;t t s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t s,@LIBDAEMON_CFLAGS@,$LIBDAEMON_CFLAGS,;t t s,@LIBDAEMON_LIBS@,$LIBDAEMON_LIBS,;t t s,@SYSINITDIR@,$SYSINITDIR,;t t @@ -7518,27 +7692,21 @@ echo X"$mf" | else continue fi - grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue - # Extract the definition of DEP_FILES from the Makefile without - # running `make'. - DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + # Extract the definition of DEPDIR, am__include, and am__quote + # 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 + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n -e '/^U = / s///p' < "$mf"` - test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" - # We invoke sed twice because it is the simplest approach to - # changing $(DEPDIR) to its actual value in the expansion. - for file in `sed -n -e ' - /^DEP_FILES = .*\\\\$/ { - s/^DEP_FILES = // - :loop - s/\\\\$// - p - n - /\\\\$/ b loop - p - } - /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + 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 # Make sure the directory exists. test -f "$dirpart/$file" && continue diff --git a/configure.ac b/configure.ac index 844639a..abca1c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -# $Id: configure.ac 115 2004-12-19 00:08:22Z lennart $ +# $Id: configure.ac 123 2005-06-04 16:07:11Z lennart $ # This file is part of ifplugd. # @@ -20,7 +20,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. AC_PREREQ(2.59) -AC_INIT([ifplugd],[0.26],[mzvscyhtq (at) 0pointer (dot) de]) +AC_INIT([ifplugd],[0.28],[mzvscyhtq (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/ifplugd.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign -Wall]) @@ -42,10 +42,10 @@ AC_PROG_MAKE_SET # If using GCC specify some additional parameters if test "x$GCC" = "xyes" ; then - CFLAGS="$CFLAGS -pipe -W -Wall -pedantic" + CFLAGS="$CFLAGS -pipe -W -Wall" AC_LANG_CONFTEST([int main() {}]) - $CC -c conftest.c -std=c99 -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -std=c99 -Wno-unused-parameter" + $CC -c conftest.c -Wno-unused-parameter $CFLAGS > /dev/null 2> /dev/null && CFLAGS="$CFLAGS -Wno-unused-parameter" rm -f conftest.o fi diff --git a/debian/apm/ifplugd b/debian/apm/ifplugd index e2ecb17..36e8d39 100644 --- a/debian/apm/ifplugd +++ b/debian/apm/ifplugd @@ -3,11 +3,11 @@ [ -f /etc/default/ifplugd ] || exit 0 . /etc/default/ifplugd -[ -z "${SUSPEND_ACTION}" -o x"${SUSPEND_ACTION}" = x"none" ] && exit 0 +[ "$SUSPEND_ACTION" ] || [ "$SUSPEND_ACTION" != "none" ] || exit 0 -if [ ${SUSPEND_ACTION} = "suspend" ] ; then +if [ "$SUSPEND_ACTION" = "suspend" ] ; then RESUME_ACTION="resume" -elif [ ${SUSPEND_ACTION} = "stop" ] ; then +elif [ "$SUSPEND_ACTION" = "stop" ] ; then RESUME_ACTION="start" else exit 0 diff --git a/debian/changelog b/debian/changelog index 93d5130..c027c79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +ifplugd (0.28-1) unstable; urgency=low + + * new upstream (closes: #336435) + * remove (functional) dependence on hotplug (closes: #338746, #334876) + * depend on debconf (>= 1.2.0) | debconf-2.0 (closes: #331853) + * typo fix in man page ifplugd.conf 'seperated' (closes: #325673) + * more typo fixes in ifplud man page (closes: #325674) + * fix path for ifplugstatus in ifstatus (closes: #357678) + * posix fixes for /etc/apm/scripts.d/ifplugd (closes: #302514) + * fix path to ifplugd.conf in man pages to /etc/default/ifplugd.conf (closes: #349317) + * added swedish debconf translation (closes: #338933) + * added german debconf translation (closes: #334422) + + -- Oliver Kurth <oku@debian.org> Mon, 27 Mar 2006 10:45:20 -0800 + ifplugd (0.26-2.1) unstable; urgency=low * NMU. diff --git a/debian/control b/debian/control index 6555d0f..a5ab6a9 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.6.1 Package: ifplugd Architecture: any -Depends: ${shlibs:Depends}, debconf (>= 1.2.0) +Depends: ${shlibs:Depends}, debconf (>= 1.2.0) | debconf-2.0 Recommends: ifupdown (>= 0.6.4-4.2) Description: A configuration daemon for ethernet devices ifplugd is a daemon which will automatically configure your diff --git a/debian/copyright b/debian/copyright index dcb09e7..34adb3f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -19,7 +19,8 @@ Copyright: You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + Please see /usr/share/common-licenses/GPL for the complete license. diff --git a/debian/dirs b/debian/dirs index 9e610d3..0fdb7a2 100644 --- a/debian/dirs +++ b/debian/dirs @@ -4,4 +4,6 @@ etc/apm/event.d etc/apm/suspend.d etc/apm/resume.d etc/apm/other.d -etc/hotplug.d/net +etc/udev/ +lib/udev + diff --git a/debian/ifplugd.postinst b/debian/ifplugd.postinst index fd082cd..0c90f26 100644 --- a/debian/ifplugd.postinst +++ b/debian/ifplugd.postinst @@ -56,15 +56,18 @@ case "$1" in write_db_conf write_default if [ ! "$2" ] || [ "$2" = "<unknown>" ] ; then - # Fresh install - for F in /etc/apm/suspend.d/20ifplugd \ - /etc/apm/resume.d/80ifplugd /etc/apm/other.d/50ifplugd ; do - [ -e $F ] && mv -f $F ${F}.dpkg-old - ln -nsf ../scripts.d/ifplugd $F - done - + # Fresh install + for F in /etc/apm/suspend.d/20ifplugd \ + /etc/apm/resume.d/80ifplugd /etc/apm/other.d/50ifplugd ; do + [ -e $F ] && mv -f $F ${F}.dpkg-old + ln -nsf ../scripts.d/ifplugd $F + done fi + # create udev rules file + if [ -z "$2" ] || [ "$2" = "<unknown>" ] || dpkg --compare-versions "$2" lt 0.28 ; then + ln -sf ../ifplugd.rules /etc/udev/rules.d/030_ifplugd.rules + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/ifplugd.postrm b/debian/ifplugd.postrm index 13b1ac1..355e51b 100644 --- a/debian/ifplugd.postrm +++ b/debian/ifplugd.postrm @@ -24,6 +24,7 @@ case "$1" in rm -f /etc/default/ifplugd rm -f /etc/ifplugd/ifplugd.conf /etc/ifplugd/ifplugd.conf.dpkg-old rm -f /etc/ifplugd/action.d/ifupdown.dpkg-old + rm -f /etc/udev/rules.d/030_ifplugd.rules # remove left overs from 0.19 (was a typo bug): rm -f /etc/apm/script.d/ifplugd /etc/apm/script.d/ifplugd.dpkg-old diff --git a/debian/ifplugd.templates b/debian/ifplugd.templates index 02f7cc6..321ca47 100644 --- a/debian/ifplugd.templates +++ b/debian/ifplugd.templates @@ -47,5 +47,5 @@ _Description: suspend behaviour: . stop: this stops ifplugd. If the -q option is not given, ifplugd will stop the interface. After resume, it will be restarted. This makes sense if you - use some mechanism (eg. gueesnet or whereami) to detect your network + use some mechanism (eg. guessnet or whereami) to detect your network environment, which may have changed while suspending. diff --git a/debian/ifplugd.hotplug b/debian/ifplugd.udev.agent index 5d3ff58..b90ede1 100644 --- a/debian/ifplugd.hotplug +++ b/debian/ifplugd.udev.agent @@ -8,7 +8,10 @@ CFG=/etc/default/$DAEMON_NAME [ -x $DAEMON ] || exit 0 +# for old hotplug: +#HOTPLUGFUNCS=/etc/hotplug/hotplug.functions HOTPLUGFUNCS=/lib/udev/hotplug.functions + [ -f $HOTPLUGFUNCS ] || exit 1 . $HOTPLUGFUNCS DEBUG=yes export DEBUG @@ -18,28 +21,18 @@ DEBUG=yes export DEBUG [ -f $CFG ] || { mesg No $DAEMON_NAME configuration file ; exit 1 ; } . $CFG -if [ -x /sbin/ifrename -a -r /etc/iftab ] ; then - IFACE_RENAMED=$(/sbin/ifrename -i $INTERFACE) - if [ $? == 0 ] ; then - debug_mesg $INTERFACE renamed to $IFACE_RENAMED - INTERFACE=$IFACE_RENAMED - else - debug_mesg ifrename failed - fi -fi - case $ACTION in add|register) for IF in $HOTPLUG_INTERFACES ; do if [ "$INTERFACE" = "$IF" -o "$IF" = "all" ] ; then debug_mesg Invoking $DAEMON_NAME for $INTERFACE - /etc/init.d/$DAEMON_NAME start $INTERFACE + exec /etc/init.d/$DAEMON_NAME start $INTERFACE& break fi done ;; remove|unregister) debug_mesg Stopping $DAEMON_NAME for $INTERFACE - /etc/init.d/$DAEMON_NAME stop $INTERFACE + exec /etc/init.d/$DAEMON_NAME stop $INTERFACE& ;; esac diff --git a/debian/ifplugd.udev.rules b/debian/ifplugd.udev.rules new file mode 100644 index 0000000..02fea85 --- /dev/null +++ b/debian/ifplugd.udev.rules @@ -0,0 +1 @@ +SUBSYSTEM=="net", RUN+="ifplugd.agent" diff --git a/debian/ifstatus b/debian/ifstatus index 7c8ea9c..a293d9c 100644 --- a/debian/ifstatus +++ b/debian/ifstatus @@ -1,4 +1,4 @@ #!/bin/sh echo "*** Usage of ifstatus is deprecated, use ifplugstatus instead! ***" > /dev/stderr -exec ifplugstatus "$@" +exec /usr/sbin/ifplugstatus "$@" diff --git a/debian/po/cs.po b/debian/po/cs.po index ae31cc3..312c91d 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ifplugd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 21:53-0800\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" "PO-Revision-Date: 2005-03-09 18:07+0100\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@debian.org>\n" @@ -143,10 +143,11 @@ msgstr "" #. Type: select #. Description #: ../ifplugd.templates:38 +#, fuzzy msgid "" "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " "the interface. After resume, it will be restarted. This makes sense if you " -"use some mechanism (eg. gueesnet or whereami) to detect your network " +"use some mechanism (eg. guessnet or whereami) to detect your network " "environment, which may have changed while suspending." msgstr "" "zastavit: timto ifplugd zastavíte. Nezadáte-li parametr -q, ifplugd rozhraní " diff --git a/debian/po/da.po b/debian/po/da.po index 1717884..8988008 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ifplugd debconf\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 21:53-0800\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" "PO-Revision-Date: 2005-03-06 16:01+0100\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -142,10 +142,11 @@ msgstr "" #. Type: select #. Description #: ../ifplugd.templates:38 +#, fuzzy msgid "" "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " "the interface. After resume, it will be restarted. This makes sense if you " -"use some mechanism (eg. gueesnet or whereami) to detect your network " +"use some mechanism (eg. guessnet or whereami) to detect your network " "environment, which may have changed while suspending." msgstr "" "stop: dette stopper ifplugd. Hvis ikke '-q'-tilvalget er givet, vil ifplugd " diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 0000000..f5de7ca --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,161 @@ +# translation of ifplugd_0.26-2_templates.po to German +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# Jens Nachtigall <nachtigall@web.de>, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: ifplugd_0.26-2_templates\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" +"PO-Revision-Date: 2005-10-12 11:55+0200\n" +"Last-Translator: Jens Nachtigall <nachtigall@web.de>\n" +"Language-Team: German <debian-l10n-german@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.9.1\n" + +#. Type: string +#. Description +#: ../ifplugd.templates:4 +msgid "static interfaces to be watched by ifplugd:" +msgstr "zu überwachende Schnittstellen, die immer (statisch) vorhanden sind:" + +#. Type: string +#. Description +#: ../ifplugd.templates:4 +msgid "" +"Specify the interfaces to control here, separated by spaces. Ifplugd " +"processes will be started for each of these interfaces when the ifplugd " +"initscript is called with the \"start\" argument. You may use the magic " +"string \"auto\" to make the initscript start or stop ifplugd processes for " +"ALL eth and wlan interfaces that are available according to /proc/net/dev. " +"Note that the list of interfaces appearing in /proc/net/dev may depend on " +"which kernel modules you have loaded." +msgstr "" +"Geben Sie hier, durch Leerzeichen getrennt, die zu überwachenden " +"Schnittstellen ein. Für jede dieser Schnittstellen wird ein ifplugd-Prozess " +"gestartet, sobald das Init-Skript von ifplugd mit dem »start«-Argument " +"aufgerufen wird. Sie können das magische Wort »auto« verwenden, um für ALLE " +"eth- und wlan-Schnittstellen, die laut /proc/net/dev verfügbar sind, einen " +"ifplugd-Prozess zu starten oder zu beenden. Beachten Sie, dass die Liste der " +"Schnittstellen, die in /proc/net/dev auftaucht, davon abhängt, welche Kernel-" +"Module Sie geladen haben." + +#. Type: string +#. Description +#: ../ifplugd.templates:4 +msgid "" +"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you " +"will be asked for those in the next question." +msgstr "" +"Sie sollten hier keine Schnittstellen angeben, welche über hotplug (USB oder " +"PCMCIA) eingebunden werden. Diese Schnittstellen werden in der nächsten " +"Frage behandelt." + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "hotplugged interfaces to be watched by ifplugd:" +msgstr "zu überwachende Schnittstellen, die über hotplug eingebunden werden:" + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "Specify the hotplugged interfaces to control here, separated by spaces." +msgstr "" +"Geben Sie hier, durch Leerzeichen getrennt, die zu überwachenden " +"Schnittstellen ein, welche über hotplug eingebunden werden." + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "" +"You may use the magic string \"all\" to make the hotplug script start an " +"ifplugd process for any hotplugged interface." +msgstr "" +"Sie können das magische Wort »all« verwenden, damit das hotplug-Skript für " +"jede über hotplug eingebundene Schnittstelle einen ifplugd-Prozess startet." + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "" +"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters." +msgstr "" +"Bei über hotplug eingebundenen Schnittstellen handelt es sich meistens um " +"PCMCIA- oder WLAN-Adapter." + +#. Type: string +#. Description +#: ../ifplugd.templates:30 +msgid "arguments to ifplugd:" +msgstr "Argumente für ifplugd:" + +#. Type: string +#. Description +#: ../ifplugd.templates:30 +msgid "" +"You can give arguments to the ifplug daemon here. See the man page for a " +"description or call ifplugd -h." +msgstr "" +"Sie können hier Argumente für den ifplugd-Daemon angeben. Lesen Sie die Man-" +"Page für eine Beschreibung oder rufen Sie »ifplugd -h« auf." + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "suspend behaviour:" +msgstr "Suspend-Verhalten:" + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "" +"When you put your notebook into suspend mode, you can choose between three " +"actions:" +msgstr "" +"Wenn ihr Notebook in den Suspend-Modus geht, kann eine dieser 3 Aktionen " +"ausgelöst werden:" + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "none: no action" +msgstr "none: nichts" + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "" +"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not " +"check the link status. This is necessary for some broken network drivers." +msgstr "" +"suspend: Dies setzt ifplugd in den Suspend-Modus. In diesem Modus überwacht " +"ifplugd nicht den Verbindungs-Status. Das ist für einige kaputte Netzwerk-" +"Treiber notwendig." + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +#, fuzzy +msgid "" +"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " +"the interface. After resume, it will be restarted. This makes sense if you " +"use some mechanism (eg. guessnet or whereami) to detect your network " +"environment, which may have changed while suspending." +msgstr "" +"stop: Dies stoppt ifplugd. Wenn die »-q«-Option nicht angegeben wurde, dann " +"wird ifplugd die Schnittstelle stoppen. Nach dem Aufwachen wird ifplugd neu " +"gestartet. Das ist sinnvoll, wenn Sie einen Mechanismus (z.B. mittels " +"guessnet oder whereami) verwenden, um Ihre Netzwerk-Umgebung automatisch zu " +"finden, welche sich während des Suspends verändert haben könnte." diff --git a/debian/po/es.po b/debian/po/es.po index e3703cc..9cdcb08 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -29,8 +29,8 @@ msgid "" msgstr "" "Project-Id-Version: ifplugd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 21:53-0800\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" "PO-Revision-Date: 2005-03-13 03:34-0500\n" "Last-Translator: Lucas Wall <lwall@debian.org>\n" "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -157,10 +157,11 @@ msgstr "" #. Type: select #. Description #: ../ifplugd.templates:38 +#, fuzzy msgid "" "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " "the interface. After resume, it will be restarted. This makes sense if you " -"use some mechanism (eg. gueesnet or whereami) to detect your network " +"use some mechanism (eg. guessnet or whereami) to detect your network " "environment, which may have changed while suspending." msgstr "" "detener: detener a «ifplugd». «Ifplugd» detendrá la interfaz, si no se lo ha " diff --git a/debian/po/fr.po b/debian/po/fr.po index 4342740..f29b173 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ifplugd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 21:53-0800\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" "PO-Revision-Date: 2005-03-06 14:48+0100\n" "Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -145,10 +145,11 @@ msgstr "" #. Type: select #. Description #: ../ifplugd.templates:38 +#, fuzzy msgid "" "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " "the interface. After resume, it will be restarted. This makes sense if you " -"use some mechanism (eg. gueesnet or whereami) to detect your network " +"use some mechanism (eg. guessnet or whereami) to detect your network " "environment, which may have changed while suspending." msgstr "" "- arrêter : cette action arrête ifplugd. Si l'option -q n'est pas présente, " diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index b39f8ef..be60e13 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: ifplugd 0.26\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 21:53-0800\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" "PO-Revision-Date: 2005-03-13 22:13-0300\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs." "org>\n" @@ -145,10 +145,11 @@ msgstr "" #. Type: select #. Description #: ../ifplugd.templates:38 +#, fuzzy msgid "" "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " "the interface. After resume, it will be restarted. This makes sense if you " -"use some mechanism (eg. gueesnet or whereami) to detect your network " +"use some mechanism (eg. guessnet or whereami) to detect your network " "environment, which may have changed while suspending." msgstr "" "parar: para o ifplugd. Se a opção -q não for informada, ifplugd vai parar a " diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..3c3d977 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,160 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: ifplugd 0.26-2\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" +"PO-Revision-Date: 2005-11-13 23:26+0100\n" +"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" +"Language-Team: Swedish <sv@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: swe\n" +"X-Poedit-Country: swe\n" + +#. Type: string +#. Description +#: ../ifplugd.templates:4 +msgid "static interfaces to be watched by ifplugd:" +msgstr "statiska gränssnitt som ska kontrolleras av ifplugd:" + +#. Type: string +#. Description +#: ../ifplugd.templates:4 +msgid "" +"Specify the interfaces to control here, separated by spaces. Ifplugd " +"processes will be started for each of these interfaces when the ifplugd " +"initscript is called with the \"start\" argument. You may use the magic " +"string \"auto\" to make the initscript start or stop ifplugd processes for " +"ALL eth and wlan interfaces that are available according to /proc/net/dev. " +"Note that the list of interfaces appearing in /proc/net/dev may depend on " +"which kernel modules you have loaded." +msgstr "" +"Specificera nätverksgränssnitten som ska kontrolleras här, separerade med " +"mellanslag. Ifplugd-processerna kommer att startas upp för varje av dessa " +"gränssnitt när ifplugds init-skript kallas upp med argumentet \"start\". Du " +"kan använda den magiska strängen \"auto\" för att init-skriptet ska starta " +"eller stoppa ifplugd-processerna för ALLA eth och wlan-gränssnitt som är " +"tillgängliga enligt /proc/net/dev. Notera att listan av gränssnitt som " +"visas i /proc/net/dev kan bero på vilka kärnmoduler du har laddat in." + +#. Type: string +#. Description +#: ../ifplugd.templates:4 +msgid "" +"You should not add interfaces that are hotplugged (USB or PCMCIA) here, you " +"will be asked for those in the next question." +msgstr "" +"Du bör inte lägga till gränssnitt som har stöd för hotplug (USB eller " +"PCMCIA) här, du kommer att bli frågad efter dessa i nästa fråga." + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "hotplugged interfaces to be watched by ifplugd:" +msgstr "gränssnitt med stöd för hotplug som ska kontrolleras av ifplugd:" + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "Specify the hotplugged interfaces to control here, separated by spaces." +msgstr "" +"Ange de gränssnitt med stöd för hotplug som ska kontrolleras här, separerade " +"med mellanslag." + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "" +"You may use the magic string \"all\" to make the hotplug script start an " +"ifplugd process for any hotplugged interface." +msgstr "" +"Du kan använda den magiska strängen \"all\" för att hotplugskriptet ska " +"starta en ifplugd-process för något gränssnitt som stöder hotplug." + +#. Type: string +#. Description +#: ../ifplugd.templates:19 +msgid "" +"Hotplugged interfaces are usually interfaces on PCMCIA or WLAN adapters." +msgstr "" +"Gränssnitt som har stöd för hotplug är normalt sett gränssnitt på PCMCIA " +"eller WLAN-adaptrar." + +#. Type: string +#. Description +#: ../ifplugd.templates:30 +msgid "arguments to ifplugd:" +msgstr "argument till ifplugd:" + +#. Type: string +#. Description +#: ../ifplugd.templates:30 +msgid "" +"You can give arguments to the ifplug daemon here. See the man page for a " +"description or call ifplugd -h." +msgstr "" +"Du kan ange argument till ifplugd-demonen här. Se manualsidan för en " +"beskrivning eller starta ifplugd med flaggan -h." + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "suspend behaviour:" +msgstr "beteende för viloläge:" + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "" +"When you put your notebook into suspend mode, you can choose between three " +"actions:" +msgstr "" +"När du försätter din bärbara dator i viloläge kan du välja mellan tre " +"åtgärder:" + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "none: no action" +msgstr "ingen: ingen åtgärd" + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +msgid "" +"suspend: this puts ifplugd into suspend mode. In this mode, ifplugd does not " +"check the link status. This is necessary for some broken network drivers." +msgstr "" +"viloläge: detta försätter ifplugd i viloläge. I detta läge kommer ifplugd " +"inte att kontrollera länkstatusen. Detta är nödvändigt för vissa brutna " +"nätverksdrivare." + +#. Type: select +#. Description +#: ../ifplugd.templates:38 +#, fuzzy +msgid "" +"stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " +"the interface. After resume, it will be restarted. This makes sense if you " +"use some mechanism (eg. guessnet or whereami) to detect your network " +"environment, which may have changed while suspending." +msgstr "" +"stopp: detta stoppar ifplugd. Om flaggan -q inte angivits kommer ifplugd " +"stoppa gränssnittet. Efter återupptagning kommer den att startas om. Detta " +"har betydelse om du användra någon mekanism (exempelvis gueesnet eller " +"whereami) för att detektera din nätverksmiljö, som kan ha ändrats under " +"återupptagningen." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 45f8f3d..00b25d0 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,22 +1,14 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 21:53-0800\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\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" @@ -126,6 +118,6 @@ msgstr "" msgid "" "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " "the interface. After resume, it will be restarted. This makes sense if you " -"use some mechanism (eg. gueesnet or whereami) to detect your network " +"use some mechanism (eg. guessnet or whereami) to detect your network " "environment, which may have changed while suspending." msgstr "" diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po index d57a08b..6fbf972 100644 --- a/debian/po/zh_TW.po +++ b/debian/po/zh_TW.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: ifplugd\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-15 21:53-0800\n" +"Report-Msgid-Bugs-To: oku@debian.org\n" +"POT-Creation-Date: 2006-03-27 10:45-0800\n" "PO-Revision-Date: 2005-03-15 16:49+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" @@ -133,10 +133,11 @@ msgstr "" #. Type: select #. Description #: ../ifplugd.templates:38 +#, fuzzy msgid "" "stop: this stops ifplugd. If the -q option is not given, ifplugd will stop " "the interface. After resume, it will be restarted. This makes sense if you " -"use some mechanism (eg. gueesnet or whereami) to detect your network " +"use some mechanism (eg. guessnet or whereami) to detect your network " "environment, which may have changed while suspending." msgstr "" "stop:關閉 ifplugdã€‚å¦‚æžœæ²’åŠ -q åƒæ•¸ï¼Œå‰‡ ifplugd 會åœæ¢è£ç½®ï¼Œé‡æ–°é–‹å§‹æ™‚會é‡å•Ÿ" diff --git a/debian/rules b/debian/rules index c8259fc..a4866eb 100755 --- a/debian/rules +++ b/debian/rules @@ -67,7 +67,8 @@ install: build $(MAKE) install DESTDIR=$(CURDIR)/debian/ifplugd # now handled by debconf: rm -f $(CURDIR)/debian/ifplugd/etc/ifplugd/ifplugd.conf - install -m 755 debian/ifplugd.hotplug $(CURDIR)/debian/ifplugd/etc/hotplug.d/net/ifplugd.hotplug + install -m 755 debian/ifplugd.udev.agent $(CURDIR)/debian/ifplugd/lib/udev/ifplugd.agent + install -m 755 debian/ifplugd.udev.rules $(CURDIR)/debian/ifplugd/etc/udev/ifplugd.rules mkdir -p $(CURDIR)/debian/ifplugd/etc/ifplugd/action.d/ install -m 755 debian/ifplugd.action $(CURDIR)/debian/ifplugd/etc/ifplugd/ install -m 755 debian/ifupdown.action $(CURDIR)/debian/ifplugd/etc/ifplugd/action.d/ifupdown diff --git a/doc/Makefile.in b/doc/Makefile.in index 55755fc..f5081ff 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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. @@ -39,7 +39,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -54,6 +53,20 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @USE_LYNX_TRUE@am__append_1 = README +subdir = doc +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/README.html.in NEWS +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = README.html +SOURCES = +DIST_SOURCES = +DATA = $(noinst_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -114,6 +127,7 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -121,6 +135,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -136,6 +152,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -143,31 +160,43 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - noinst_DATA = README.html README EXTRA_DIST = $(noinst_DATA) style.css README.html.in SUPPORTED_DRIVERS NEWS README.SuSE - MAINTAINERCLEANFILES = README README.html CLEANFILES = $(am__append_1) -subdir = doc -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = README.html -DIST_SOURCES = -DATA = $(noinst_DATA) - -DIST_COMMON = README $(srcdir)/Makefile.in Makefile.am NEWS \ - README.html.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -README.html: $(top_builddir)/config.status README.html.in +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +README.html: $(top_builddir)/config.status $(srcdir)/README.html.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uninstall-info-am: tags: TAGS @@ -176,10 +205,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -193,7 +218,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -211,7 +236,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(DATA) - installdirs: install: install-am install-exec: install-exec-am @@ -233,7 +257,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -251,6 +275,8 @@ dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -284,8 +310,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ @@ -1,12 +1,12 @@ - ifplugd 0.26 + ifplugd 0.28 - Copyright 2002-2004 Lennart Poettering <mzvscyhtq (at) 0pointer (dot) + Copyright 2002-2005 Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de> * [1]License * [2]News * [3]Overview - * [4]Status + * [4]Current Status * [5]Documentation * [6]Requirements * [7]Installation @@ -31,14 +31,23 @@ License News + Sat Jun 4 2005: + + [10]Version 0.28 released, changes include: build fixes from Stefan + Seyfried. + + Wed Mar 30 2005: + + [11]Version 0.27 released, changes include: new option --no-startup. + Sun Dec 19 2004: - [10]Version 0.26 released, changes include: changed MII code for + [12]Version 0.26 released, changes include: changed MII code for better compatibility with some 3COM Boomerang cards. Mon May 10 2004: - [11]Version 0.25 released, changes include: Revert to more classic + [13]Version 0.25 released, changes include: Revert to more classic link checking support. The new checking order is: ETHTOOL, MII, WLAN, IFF. The obsolete API "PRIV" is no longer checked by the automatic API detection code. However, you may enable it forcibly by passing -m priv @@ -46,56 +55,56 @@ News Mon Apr 12 2004: - [12]Version 0.24 released, changes include: add IFF_RUNNING link check + [14]Version 0.24 released, changes include: add IFF_RUNNING link check support and make it the default. This might break some setups. You may workaround this by passing -m to the daemon for selecting a different API. Please report breakages! Wed Apr 7 2004: - [13]Version 0.23 released, changes include: don't make /dev/tty1 the + [15]Version 0.23 released, changes include: don't make /dev/tty1 the controlling TTY when beeping Tue Feb 10 2004: - [14]Version 0.22 released, changes include: rename ifstatus to + [16]Version 0.22 released, changes include: rename ifstatus to ifplugstatus due to namespace collision, minor fixes Mon Jan 26 2004: - [15]Version 0.21b released, added missing file. + [17]Version 0.21b released, added missing file. Mon Jan 26 2004: - [16]Version 0.21 released, changes include: better compatibility with + [18]Version 0.21 released, changes include: better compatibility with wireless devices, compatibility with newer kernels Sun Nov 9 2003: - [17]Version 0.20 released, changes include: fix wrong message, build + [19]Version 0.20 released, changes include: fix wrong message, build fix Mon Oct 20 2003: - [18]Version 0.19 released, changes include: New option - --wait-for-kill, this requires [19]libdaemon 0.3 + [20]Version 0.19 released, changes include: New option + --wait-for-kill, this requires [21]libdaemon 0.3 Fri Oct 17 2003: - [20]Version 0.18 released, changes include: Some bugs fixed + [22]Version 0.18 released, changes include: Some bugs fixed Fri Sep 13 2003: - [21]Version 0.17b released, changes include: typo and date fix + [23]Version 0.17b released, changes include: typo and date fix Fri Sep 13 2003: - [22]Version 0.17 released, changes include: documentation update, + [24]Version 0.17 released, changes include: documentation update, better support for multiple interfaces, gcc 2.95 build fix Thu Aug 13 2003: - [23]Version 0.16 released, changes include: RPM spec file added, build + [25]Version 0.16 released, changes include: RPM spec file added, build fixes, WLAN improvements (including compatibility with the upcoming waproamd, a WLAN roaming daemon), monitor mode for use in conjunction with PCMCIA devices, better support for multiple interface setups, @@ -103,13 +112,13 @@ News Thu July 10 2003: - [24]Version 0.15 released, changes include: bad umask fix, + [26]Version 0.15 released, changes include: bad umask fix, documentation update Mon July 7 2003: - [25]Version 0.14 released, changes include: autoconf usage, new - dependency [26]libdaemon, wireless LAN support, support for + [27]Version 0.14 released, changes include: autoconf usage, new + dependency [28]libdaemon, wireless LAN support, support for suspending/resuming, many fixes Overview @@ -139,21 +148,21 @@ Overview * Can be configured to ignore short "unplugged" periods (-d option) or short "plugged" periods(-u option) * Support for wireless networking. Whenever an association to an AP - is detected the network is configured. Have a look on [27]waproamd + is detected the network is configured. Have a look on [29]waproamd if you need a facility to configure WEP keys before AP associations succeed. * Compatibility mode for network devices which do not support cable detection (-F option) -Status +Current Status - Version 0.26 is stable and has all the sensible features its users + Version 0.28 is stable and has all the sensible features its users could think of. Documentation - Have a look on the man pages [28]ifplugd(8), [29]ifplugstatus(8), - [30]ifplugd.conf(5). (An XSLT capable browser is required) + Have a look on the man pages [30]ifplugd(8), [31]ifplugstatus(8), + [32]ifplugd.conf(5). (An XSLT capable browser is required) Configuration @@ -237,7 +246,7 @@ Documentation A: This is a bug in the 8139too driver 0.9.25 (at least) shipped with Linux 2.4.19, please upgrade to 8139too 0.9.26 (Linux 2.4.20 or seperately at - [31]http://www.sourceforge.net/projects/gkernel/). + [33]http://www.sourceforge.net/projects/gkernel/). 6. Q: There are already laptop-net's ifd and miid, why did you write your own daemon? A: laptop-net was too integrated with its profile system and @@ -247,8 +256,14 @@ Documentation disabled. I didn't know about miid when I wrote ifplugd, but in any case ifplugd is much better than miid. For a comparison of miid and ifplugd, have a look on - [32]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat + [34]http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeat merged=yes + 7. Q: I have two interfaces (e.g. WLAN and copper ethernet), both + controlled by ifplugd, and want to force the network traffic to go + over the faster one of them, in case both are available at the + same time. How can I do this? + A: A tool I wrote called [35]ifmetric might be exactly what you're + looking for. Requirements @@ -265,7 +280,7 @@ Requirements The machine used was a Medion 9580-F laptop with a Realtek 8139 network card and a PRISM1 PCMCIA wireless LAN card. - ifplugd needs [33]libdaemon. + ifplugd needs [36]libdaemon. Installation @@ -279,7 +294,7 @@ Installation for it. Extensive installation instructions for installation of ifplugd on - Fedora Core 1 are available at [34]Geoff Ericksson's web site. + Fedora Core 1 are available at [37]Geoff Ericksson's web site. Acknowledgements @@ -288,39 +303,41 @@ Acknowledgements Oliver Kurth for packaging ifplugd for Debian and ifplugd's manpage - Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David - Mitchell, Norbert Preining, Herbert Graeber for patches + Stefan Seyfried, Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. + Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for + patches Frederic Lepied for integrating ifplugd into Mandrake Linux Download The newest release is always available from - [35]http://0pointer.de/lennart/projects/ifplugd/ + [38]http://0pointer.de/lennart/projects/ifplugd/ - The current release is [36]0.26 + The current release is [39]0.28 - Get ifplugd's development sources from the [37]Subversion - [38]repository ([39]viewcvs): + Get ifplugd's development sources from the [40]Subversion + [41]repository ([42]viewcvs): svn checkout svn://seth.intheinter.net/ifplugd/trunk ifplugd - You may find an up to date Debian package of ifplugd on the [40]Debian + You may find an up to date Debian package of ifplugd on the [43]Debian package repository. - Packages for Mandrake Linux may be found in the Cooker distribution; - Gentoo packages are available as well; [41]SuSE packages are available - courtesy of Herbert Graeber. + ifplugd is nowadays included in many popular distributions (Mandrake, + Gentoo, Suse, Debian, Ubuntu); [44]Conectiva packages are available + courtesy of Gonzalo Nemmi. Fedora Core packages are available from + [45]Dag Wieers. If you want to be notified whenever I release a new version of this - software use the subscription feature of [42]Freshmeat. + software use the subscription feature of [46]Freshmeat. - New! There is a joint ifplugd and waproamd [43]mailing list available. + New! There is a joint ifplugd and waproamd [47]mailing list available. _________________________________________________________________ - Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, December 2004 + Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005 - $Id: README.html.in 117 2004-12-19 00:30:39Z lennart $ + $Id: README.html.in 124 2005-06-04 19:22:59Z lennart $ References @@ -333,37 +350,41 @@ References 7. README#installation 8. README#acks 9. README#download - 10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz - 11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz - 12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz - 13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz - 14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz - 15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz - 16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz - 17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz - 18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz - 19. http://0pointer.de/lennart/projects/libdaemon/ - 20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz - 21. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz - 22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz - 23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz - 24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz - 25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz - 26. http://0pointer.de/lennart/projects/libdaemon/ - 27. http://0pointer.de/lennart/projects/waproamd/ - 28. http://0pointer.de/lennart/projects/ifplugd/ifplugd.8.xml - 29. http://0pointer.de/lennart/projects/ifplugd/ifplugstatus.8.xml - 30. http://0pointer.de/lennart/projects/ifplugd/ifplugd.conf.5.xml - 31. http://www.sourceforge.net/projects/gkernel/ - 32. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes - 33. http://0pointer.de/lennart/projects/libdaemon/ - 34. http://www.acmc.uq.edu.au/~gbe/linux/installation_of_ifplugd.html - 35. http://0pointer.de/lennart/projects/ifplugd/ - 36. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz - 37. http://subversion.tigris.org/ - 38. svn://seth.intheinter.net/ifplugd - 39. http://0pointer.de/cgi-bin/viewcvs.cgi/?root=ifplugd - 40. http://packages.debian.org/ifplugd - 41. http://packman.links2linux.de/ - 42. http://freshmeat.net/projects/ifplugd/ - 43. https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss + 10. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz + 11. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz + 12. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz + 13. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.25.tar.gz + 14. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.24.tar.gz + 15. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.23.tar.gz + 16. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.22.tar.gz + 17. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21b.tar.gz + 18. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.21.tar.gz + 19. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.20.tar.gz + 20. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.19.tar.gz + 21. http://0pointer.de/lennart/projects/libdaemon/ + 22. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.18.tar.gz + 23. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17b.tar.gz + 24. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.17.tar.gz + 25. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.16.tar.gz + 26. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.15.tar.gz + 27. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.14.tar.gz + 28. http://0pointer.de/lennart/projects/libdaemon/ + 29. http://0pointer.de/lennart/projects/waproamd/ + 30. http://0pointer.de/lennart/projects/ifplugd/ifplugd.8.xml + 31. http://0pointer.de/lennart/projects/ifplugd/ifplugstatus.8.xml + 32. http://0pointer.de/lennart/projects/ifplugd/ifplugd.conf.5.xml + 33. http://www.sourceforge.net/projects/gkernel/ + 34. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes + 35. http://0pointer.de/lennart/projects/ifmetric/ + 36. http://0pointer.de/lennart/projects/libdaemon/ + 37. http://www.acmc.uq.edu.au/~gbe/linux/installation_of_ifplugd.html + 38. http://0pointer.de/lennart/projects/ifplugd/ + 39. http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz + 40. http://subversion.tigris.org/ + 41. svn://seth.intheinter.net/ifplugd + 42. http://0pointer.de/cgi-bin/viewcvs.cgi/?root=ifplugd + 43. http://packages.debian.org/ifplugd + 44. http://www.linuxdicas.com.ar/caleb/rpm + 45. http://dag.wieers.com/packages/ifplugd/ + 46. http://freshmeat.net/projects/ifplugd/ + 47. https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss diff --git a/doc/README.html b/doc/README.html index e0cd5a2..3160855 100644 --- a/doc/README.html +++ b/doc/README.html @@ -3,20 +3,20 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<title>ifplugd 0.26</title> +<title>ifplugd 0.28</title> <link rel="stylesheet" type="text/css" href="style.css" /> </head> <body> -<h1><a name="top">ifplugd 0.26</a></h1> +<h1><a name="top">ifplugd 0.28</a></h1> -<p><i>Copyright 2002-2004 Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de></i></p> +<p><i>Copyright 2002-2005 Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de></i></p> <ul class="toc"> <li><a href="#license">License</a></li> <li><a href="#news">News</a></li> <li><a href="#overview">Overview</a></li> - <li><a href="#status">Status</a></li> + <li><a href="#status">Current Status</a></li> <li><a href="#documentation">Documentation</a></li> <li><a href="#requirements">Requirements</a></li> <li><a href="#installation">Installation</a></li> @@ -42,6 +42,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p> <h2><a name="news">News</a></h2> +<div class="news-date">Sat Jun 4 2005: </div> <p class="news-text"><a +href="http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz">Version 0.28</a> released, +changes include: build fixes from Stefan Seyfried.</p> + +<div class="news-date">Wed Mar 30 2005: </div> <p class="news-text"><a +href="http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.27.tar.gz">Version 0.27</a> released, +changes include: new option <tt>--no-startup</tt>.</p> + <div class="news-date">Sun Dec 19 2004: </div> <p class="news-text"><a href="http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz">Version 0.26</a> released, changes include: changed MII code for better compatibility with some 3COM Boomerang cards.</p> @@ -148,9 +156,9 @@ if you need a facility to configure WEP keys before AP associations succeed.</li <li>Compatibility mode for network devices which do not support cable detection (<tt>-F</tt> option)</li> </ul> -<h2><a name="status">Status</a></h2> +<h2><a name="status">Current Status</a></h2> -<p>Version 0.26 is stable and has all the sensible features its users could think of.</p> +<p>Version 0.28 is stable and has all the sensible features its users could think of.</p> <h2><a name="documentation">Documentation</a></h2> @@ -270,9 +278,13 @@ than <tt>miid</tt>. For a comparison of <tt>miid</tt> and <tt>ifplugd</tt>, have a look on <a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes">http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes</a></p></li> -</ol> +<li><p><b>Q:</b> I have two interfaces (e.g. WLAN and copper ethernet), both controlled by <tt>ifplugd</tt>, and want to force the network traffic to go over the faster one of them, in case both are available at the same time. How can I do this?</p> + +<p><b>A:</b> A tool I wrote called <a href="http://0pointer.de/lennart/projects/ifmetric/"><tt>ifmetric</tt></a> might be exactly what you're looking for.</p></li> +</ol> + <h2><a name="requirements">Requirements</a></h2> <p>A newer Linux Kernel (I think 2.2 is good enough, alltough I tested it @@ -314,7 +326,7 @@ on their source codes for learning how to use the link beat ioctls.</p> <p>Oliver Kurth for packaging <tt>ifplugd</tt> for Debian and <tt>ifplugd</tt>'s manpage</p> -<p>Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches</p> +<p>Stefan Seyfried, Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches</p> <p>Frederic Lepied for integrating <tt>ifplugd</tt> into Mandrake Linux</p> @@ -322,7 +334,7 @@ manpage</p> <p>The newest release is always available from <a href="http://0pointer.de/lennart/projects/ifplugd/">http://0pointer.de/lennart/projects/ifplugd/</a></p> -<p>The current release is <a href="http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.26.tar.gz">0.26</a></p> +<p>The current release is <a href="http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz">0.28</a></p> <p>Get <tt>ifplugd</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="svn://seth.intheinter.net/ifplugd">repository</a> (<a href="http://0pointer.de/cgi-bin/viewcvs.cgi/?root=ifplugd">viewcvs</a>): </p> @@ -330,15 +342,15 @@ manpage</p> <p>You may find an up to date Debian package of <tt>ifplugd</tt> on the <a href="http://packages.debian.org/ifplugd">Debian package repository</a>.</p> -<p>Packages for Mandrake Linux may be found in the Cooker distribution; Gentoo packages are available as well; <a href="http://packman.links2linux.de/">SuSE packages</a> are available courtesy of Herbert Graeber.</p> +<p><tt>ifplugd</tt> is nowadays included in many popular distributions (Mandrake, Gentoo, Suse, Debian, Ubuntu); <a href="http://www.linuxdicas.com.ar/caleb/rpm">Conectiva packages</a> are available courtesy of Gonzalo Nemmi. Fedora Core packages are available from <a href="http://dag.wieers.com/packages/ifplugd/">Dag Wieers</a>.</p> <p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/ifplugd/">Freshmeat</a>.</p> <p><b>New!</b> There is a joint <tt>ifplugd</tt> and <tt>waproamd</tt> <a href="https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss">mailing list</a> available.</p> <hr/> -<address class="grey">Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, December 2004</address> -<div class="grey"><i>$Id: README.html.in 117 2004-12-19 00:30:39Z lennart $</i></div> +<address class="grey">Lennart Poettering <mzvscyhtq (at) 0pointer (dot) de>, June 2005</address> +<div class="grey"><i>$Id: README.html.in 124 2005-06-04 19:22:59Z lennart $</i></div> </body> </html> diff --git a/doc/README.html.in b/doc/README.html.in index 1a3c8ab..baf63e0 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -10,13 +10,13 @@ <body> <h1><a name="top">ifplugd @PACKAGE_VERSION@</a></h1> -<p><i>Copyright 2002-2004 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p> +<p><i>Copyright 2002-2005 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p> <ul class="toc"> <li><a href="#license">License</a></li> <li><a href="#news">News</a></li> <li><a href="#overview">Overview</a></li> - <li><a href="#status">Status</a></li> + <li><a href="#status">Current Status</a></li> <li><a href="#documentation">Documentation</a></li> <li><a href="#requirements">Requirements</a></li> <li><a href="#installation">Installation</a></li> @@ -42,6 +42,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.</p> <h2><a name="news">News</a></h2> +<div class="news-date">Sat Jun 4 2005: </div> <p class="news-text"><a +href="@PACKAGE_URL@ifplugd-0.27.tar.gz">Version 0.28</a> released, +changes include: build fixes from Stefan Seyfried.</p> + +<div class="news-date">Wed Mar 30 2005: </div> <p class="news-text"><a +href="@PACKAGE_URL@ifplugd-0.27.tar.gz">Version 0.27</a> released, +changes include: new option <tt>--no-startup</tt>.</p> + <div class="news-date">Sun Dec 19 2004: </div> <p class="news-text"><a href="@PACKAGE_URL@ifplugd-0.26.tar.gz">Version 0.26</a> released, changes include: changed MII code for better compatibility with some 3COM Boomerang cards.</p> @@ -148,7 +156,7 @@ if you need a facility to configure WEP keys before AP associations succeed.</li <li>Compatibility mode for network devices which do not support cable detection (<tt>-F</tt> option)</li> </ul> -<h2><a name="status">Status</a></h2> +<h2><a name="status">Current Status</a></h2> <p>Version @PACKAGE_VERSION@ is stable and has all the sensible features its users could think of.</p> @@ -270,9 +278,13 @@ than <tt>miid</tt>. For a comparison of <tt>miid</tt> and <tt>ifplugd</tt>, have a look on <a href="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes">http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=162763&repeatmerged=yes</a></p></li> -</ol> +<li><p><b>Q:</b> I have two interfaces (e.g. WLAN and copper ethernet), both controlled by <tt>ifplugd</tt>, and want to force the network traffic to go over the faster one of them, in case both are available at the same time. How can I do this?</p> + +<p><b>A:</b> A tool I wrote called <a href="http://0pointer.de/lennart/projects/ifmetric/"><tt>ifmetric</tt></a> might be exactly what you're looking for.</p></li> +</ol> + <h2><a name="requirements">Requirements</a></h2> <p>A newer Linux Kernel (I think 2.2 is good enough, alltough I tested it @@ -314,7 +326,7 @@ on their source codes for learning how to use the link beat ioctls.</p> <p>Oliver Kurth for packaging <tt>ifplugd</tt> for Debian and <tt>ifplugd</tt>'s manpage</p> -<p>Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches</p> +<p>Stefan Seyfried, Thomas Hood, Asgeir Nilsen, Sean Reifschneider, R. Steve McKown, David Mitchell, Norbert Preining, Herbert Graeber for patches</p> <p>Frederic Lepied for integrating <tt>ifplugd</tt> into Mandrake Linux</p> @@ -330,15 +342,15 @@ manpage</p> <p>You may find an up to date Debian package of <tt>ifplugd</tt> on the <a href="http://packages.debian.org/ifplugd">Debian package repository</a>.</p> -<p>Packages for Mandrake Linux may be found in the Cooker distribution; Gentoo packages are available as well; <a href="http://packman.links2linux.de/">SuSE packages</a> are available courtesy of Herbert Graeber.</p> +<p><tt>ifplugd</tt> is nowadays included in many popular distributions (Mandrake, Gentoo, Suse, Debian, Ubuntu); <a href="http://www.linuxdicas.com.ar/caleb/rpm">Conectiva packages</a> are available courtesy of Gonzalo Nemmi. Fedora Core packages are available from <a href="http://dag.wieers.com/packages/ifplugd/">Dag Wieers</a>.</p> <p>If you want to be notified whenever I release a new version of this software use the subscription feature of <a href="http://freshmeat.net/projects/ifplugd/">Freshmeat</a>.</p> <p><b>New!</b> There is a joint <tt>ifplugd</tt> and <tt>waproamd</tt> <a href="https://seth.intheinter.net/mailman/listinfo/ifplugd-discuss">mailing list</a> available.</p> <hr/> -<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, December 2004</address> -<div class="grey"><i>$Id: README.html.in 117 2004-12-19 00:30:39Z lennart $</i></div> +<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, June 2005</address> +<div class="grey"><i>$Id: README.html.in 124 2005-06-04 19:22:59Z lennart $</i></div> </body> </html> diff --git a/doc/style.css b/doc/style.css index 27f0bdd..d889617 100644 --- a/doc/style.css +++ b/doc/style.css @@ -1,10 +1,10 @@ -/* $Id: style.css 84 2004-01-16 16:08:55Z lennart $ */ +/* $Id: style.css 121 2005-03-30 16:28:56Z lennart $ */ /*** * This file is part of ifplugd. * * ifplugd is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by + * under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * @@ -13,20 +13,13 @@ * 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 + * You should have received a copy of the GNU Lesser General Public License * along with ifplugd; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. ***/ -body { color: black; background-color: white; margin: 0.5cm; } +body { color: black; background-color: white; } a:link, a:visited { color: #900000; } -p { margin-left: 0.5cm; margin-right: 0.5cm; } -div.news-date { margin-left: 0.5cm; font-size: 80%; color: #4f0000; } -p.news-text { margin-left: 1cm; } -h1 { color: #00009F; } -h2 { color: #00009F; } -h3 { color: #00004F; margin-left: 0.5cm; } -ul { margin-left: .5cm; } -ol { margin-left: .5cm; } -pre { margin-left: .5cm; background-color: #f0f0f0; padding: 0.4cm;} -.grey { color: #afafaf; } +div.news-date { font-size: 80%; font-style: italic; } +pre { background-color: #f0f0f0; padding: 0.4cm; } +.grey { color: #8f8f8f; font-size: 80%; } diff --git a/ifplugd.spec b/ifplugd.spec index 8bf088b..f3f7fc9 100644 --- a/ifplugd.spec +++ b/ifplugd.spec @@ -2,7 +2,7 @@ Summary: Detect and perform actions when an ethernet cable is (un)plugged. Name: ifplugd -Version: 0.26 +Version: 0.28 Release: 1 Copyright: GPL Group: Networking/Daemons diff --git a/man/Makefile.in b/man/Makefile.in index 432cfd9..336f692 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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. @@ -39,7 +39,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -54,6 +53,24 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : @USE_XMLTOMAN_TRUE@am__append_1 = $(man_MANS) +subdir = man +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +man5dir = $(mandir)/man5 +am__installdirs = "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)" +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(man_MANS) +DATA = $(noinst_DATA) +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -114,6 +131,7 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -121,6 +139,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -136,6 +156,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -143,40 +164,47 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - man_MANS = ifplugd.8 ifplugd.conf.5 ifplugstatus.8 - noinst_DATA = ifplugd.8.xml ifplugd.conf.5.xml ifplugstatus.8.xml - EXTRA_DIST = $(man_MANS) ifplugd.8.xml.in ifplugd.conf.5.xml.in ifplugstatus.8.xml.in xmltoman.css xmltoman.xsl xmltoman.dtd - -CLEANFILES = ifplugd.8.xml ifplugd.conf.5.xml ifplugstatus.8.xml $(am__append_1) -subdir = man -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = - -NROFF = nroff -MANS = $(man_MANS) -DATA = $(noinst_DATA) - -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +CLEANFILES = ifplugd.8.xml ifplugd.conf.5.xml ifplugstatus.8.xml \ + $(am__append_1) all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign man/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: - -man5dir = $(mandir)/man5 install-man5: $(man5_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man5dir) + test -z "$(man5dir)" || $(mkdir_p) "$(DESTDIR)$(man5dir)" @list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -195,8 +223,8 @@ install-man5: $(man5_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man5dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \ done uninstall-man5: @$(NORMAL_UNINSTALL) @@ -216,14 +244,12 @@ uninstall-man5: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man5dir)/$$inst"; \ - rm -f $(DESTDIR)$(man5dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man5dir)/$$inst"; \ done - -man8dir = $(mandir)/man8 install-man8: $(man8_MANS) $(man_MANS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(man8dir) + test -z "$(man8dir)" || $(mkdir_p) "$(DESTDIR)$(man8dir)" @list='$(man8_MANS) $(dist_man8_MANS) $(nodist_man8_MANS)'; \ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ for i in $$l2; do \ @@ -242,8 +268,8 @@ install-man8: $(man8_MANS) $(man_MANS) inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst"; \ done uninstall-man8: @$(NORMAL_UNINSTALL) @@ -263,8 +289,8 @@ uninstall-man8: inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ inst=`echo $$inst | sed -e 's/^.*\///'`; \ inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \ - rm -f $(DESTDIR)$(man8dir)/$$inst; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$inst'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$inst"; \ done tags: TAGS TAGS: @@ -272,10 +298,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -289,7 +311,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -307,9 +329,10 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(MANS) $(DATA) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(man5dir) $(DESTDIR)$(man8dir) + for dir in "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -330,7 +353,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -347,6 +370,8 @@ dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -382,8 +407,8 @@ uninstall-am: uninstall-info-am uninstall-man uninstall-man: uninstall-man5 uninstall-man8 .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-man5 install-man8 install-strip installcheck \ installcheck-am installdirs maintainer-clean \ diff --git a/man/ifplugd.8 b/man/ifplugd.8 index 302d9d3..cafa94e 100644 --- a/man/ifplugd.8 +++ b/man/ifplugd.8 @@ -51,6 +51,9 @@ Specify delay for deconfiguring interface (default: 5) \fB-m | --api-mode=\f1 \fIMODE\f1 Force a specific link beat detection ioctl() API. Possible values are auto, iff, wlan, ethtool, mii, and priv for automatic detection, interface flag (IFF_RUNNING), wireless extension, SIOCETHTOOL, SIOCGMIIREG resp. SIOCPRIV. Only the first character of the argument is relevant, case insensitive. (default: auto) .TP +\fB-p | --no-startup\f1 +Don't call the script to bring up network on deamon start (default: off) +.TP \fB-q | --no-shutdown\f1 Don't call the script for network shutdown on deamon quit (default: off) .TP diff --git a/man/ifplugd.8.xml.in b/man/ifplugd.8.xml.in index d40f1bc..dd23e36 100644 --- a/man/ifplugd.8.xml.in +++ b/man/ifplugd.8.xml.in @@ -2,7 +2,7 @@ <!DOCTYPE manpage SYSTEM "xmltoman.dtd"> <?xml-stylesheet type="text/xsl" href="xmltoman.xsl" ?> -<!-- $Id: ifplugd.8.xml.in 109 2004-04-12 13:58:11Z lennart $ --> +<!-- $Id: ifplugd.8.xml.in 119 2005-03-30 16:14:39Z lennart $ --> <!-- This file is part of ifplugd. @@ -143,6 +143,13 @@ </option> <option> + <p><opt>-p | --no-startup</opt></p> + <optdesc><p> + Don't call the script to bring up network on deamon start (default: off) + </p></optdesc> + </option> + + <option> <p><opt>-q | --no-shutdown</opt></p> <optdesc><p> Don't call the script for network shutdown on deamon quit (default: off) @@ -178,7 +185,7 @@ <option> <p><opt>-M | --monitor</opt></p> <optdesc><p> - Don't fail when the network interface is not available, instead use NETLINK to monitor device avaibility. The is useful for PCMCIA devices and similar. + Don't fail when the network interface is not available, instead use NETLINK to monitor device availability. The is useful for PCMCIA devices and similar. </p></optdesc> </option> @@ -211,7 +218,7 @@ </option> <option> - <p><opt>-S | --supend</opt></p> <optdesc><p> Suspend a running + <p><opt>-S | --suspend</opt></p> <optdesc><p> Suspend a running daemon. The daemon will no longer check the link status until it is resumed (-R) again. (Specify -i to select the daemon instance to suspend.) </p></optdesc> @@ -234,14 +241,14 @@ <section name="Files"> - <p><file>@sysconfdir@/ifplugd/ifplugd.conf</file>: this file is sourced + <p><file>@sysconfdir@/default/ifplugd.conf</file>: this file is sourced by the init script <file>@sysconfdir@/init.d/ifplugd</file> and contains the interface to be monitored and the options to be used.</p> <p><file>@sysconfdir@/ifplugd/ifplugd.action</file>: this is the script which will be called by the daemon whenever the state of the - interface changes. It takes two areguments: the first is the interface + interface changes. It takes two arguments: the first is the interface name (eg. eth0), the second either "up" or "down". </p> <p><file>/var/run/ifplugd.<iface>.pid</file>: the pid file diff --git a/man/ifplugd.conf.5.xml.in b/man/ifplugd.conf.5.xml.in index 7da7da0..70c0153 100644 --- a/man/ifplugd.conf.5.xml.in +++ b/man/ifplugd.conf.5.xml.in @@ -25,7 +25,7 @@ <manpage name="ifplugd.conf" section="5" desc="ifplugd configuration file"> <synopsis> - <cmd>@sysconfdir@/ifplugd/ifplugd.conf</cmd> + <cmd>@sysconfdir@/default/ifplugd.conf</cmd> </synopsis> <description> @@ -40,7 +40,7 @@ <option> <p><opt>INTERFACES</opt></p> <optdesc><p>Specifies the ethernet interfaces to monitor. It has to contain a space - seperated list of network interfaces names. Most users will + separated list of network interfaces names. Most users will probably use "eth0" here, however you may add additional interfaces for monitoring more than one device. A special value is supported as well: "auto" will enable a more or less diff --git a/patches/Makefile.in b/patches/Makefile.in index 6aaa6bd..3790e74 100644 --- a/patches/Makefile.in +++ b/patches/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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. @@ -31,7 +31,6 @@ # You should have received a copy of the GNU General Public License # along with ifplugd; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,7 +38,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -53,6 +51,18 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +subdir = patches +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -113,6 +123,7 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -120,6 +131,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -135,6 +148,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -142,23 +156,39 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - EXTRA_DIST = 8139too.c.0.9.26.patch -subdir = patches -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -DIST_SOURCES = -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign patches/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign patches/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh uninstall-info-am: tags: TAGS TAGS: @@ -166,10 +196,6 @@ TAGS: ctags: CTAGS CTAGS: -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -183,7 +209,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -201,7 +227,6 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile - installdirs: install: install-am install-exec: install-exec-am @@ -222,7 +247,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -239,6 +264,8 @@ dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -272,8 +299,8 @@ ps-am: uninstall-am: uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ install-exec-am install-info install-info-am install-man \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ diff --git a/src/Makefile.in b/src/Makefile.in index b8a44cc..016f51c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.7.9 from Makefile.am. +# Makefile.in generated by automake 1.9.5 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 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. @@ -32,6 +32,8 @@ # along with ifplugd; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +SOURCES = $(ifplugd_SOURCES) $(ifplugstatus_SOURCES) + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -39,7 +41,6 @@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = .. - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 @@ -53,8 +54,43 @@ POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : +sbin_PROGRAMS = ifplugd$(EXEEXT) ifplugstatus$(EXEEXT) @USE_SUBVERSION_TRUE@am__append_1 = svn-revision.h @USE_SUBVERSION_TRUE@am__append_2 = svn-revision.h +subdir = src +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +am__installdirs = "$(DESTDIR)$(sbindir)" +sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +PROGRAMS = $(sbin_PROGRAMS) +am_ifplugd_OBJECTS = ifplugd.$(OBJEXT) interface.$(OBJEXT) \ + ifmonitor.$(OBJEXT) nlapi.$(OBJEXT) +ifplugd_OBJECTS = $(am_ifplugd_OBJECTS) +ifplugd_LDADD = $(LDADD) +am__DEPENDENCIES_1 = +ifplugd_DEPENDENCIES = $(am__DEPENDENCIES_1) +am_ifplugstatus_OBJECTS = ifplugstatus.$(OBJEXT) interface.$(OBJEXT) +ifplugstatus_OBJECTS = $(am_ifplugstatus_OBJECTS) +ifplugstatus_LDADD = $(LDADD) +ifplugstatus_DEPENDENCIES = $(am__DEPENDENCIES_1) +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(ifplugd_SOURCES) $(ifplugstatus_SOURCES) +DIST_SOURCES = $(ifplugd_SOURCES) $(ifplugstatus_SOURCES) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ @@ -115,6 +151,7 @@ VERSION = @VERSION@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_STRIP = @ac_ct_STRIP@ +ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ @@ -122,6 +159,8 @@ am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ bindir = @bindir@ build_alias = @build_alias@ datadir = @datadir@ @@ -137,6 +176,7 @@ libdir = @libdir@ libexecdir = @libexecdir@ localstatedir = @localstatedir@ mandir = @mandir@ +mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ prefix = @prefix@ program_transform_name = @program_transform_name@ @@ -144,12 +184,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ - AM_CFLAGS = $(LIBDAEMON_CFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -D_GNU_SOURCE LDADD = $(LIBDAEMON_LIBS) - -sbin_PROGRAMS = ifplugd ifplugstatus - ifplugd_SOURCES = ifplugd.c \ interface.c interface.h \ ethtool-kernel.h ethtool-local.h \ @@ -158,71 +194,58 @@ ifplugd_SOURCES = ifplugd.c \ nlapi.h nlapi.c \ svn-revision.h - ifplugstatus_SOURCES = ifplugstatus.c \ interface.c interface.h \ ethtool-kernel.h ethtool-local.h \ wireless.h wireless.15.h wireless.16.h \ svn-revision.h - MAINTAINERCLEANFILES = $(am__append_1) BUILT_SOURCES = $(am__append_2) -subdir = src -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = -sbin_PROGRAMS = ifplugd$(EXEEXT) ifplugstatus$(EXEEXT) -PROGRAMS = $(sbin_PROGRAMS) - -am_ifplugd_OBJECTS = ifplugd.$(OBJEXT) interface.$(OBJEXT) \ - ifmonitor.$(OBJEXT) nlapi.$(OBJEXT) -ifplugd_OBJECTS = $(am_ifplugd_OBJECTS) -ifplugd_LDADD = $(LDADD) -ifplugd_DEPENDENCIES = -ifplugd_LDFLAGS = -am_ifplugstatus_OBJECTS = ifplugstatus.$(OBJEXT) interface.$(OBJEXT) -ifplugstatus_OBJECTS = $(am_ifplugstatus_OBJECTS) -ifplugstatus_LDADD = $(LDADD) -ifplugstatus_DEPENDENCIES = -ifplugstatus_LDFLAGS = - -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/ifmonitor.Po ./$(DEPDIR)/ifplugd.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/ifplugstatus.Po \ -@AMDEP_TRUE@ ./$(DEPDIR)/interface.Po ./$(DEPDIR)/nlapi.Po -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DIST_SOURCES = $(ifplugd_SOURCES) $(ifplugstatus_SOURCES) -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am -SOURCES = $(ifplugd_SOURCES) $(ifplugstatus_SOURCES) - all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ cd $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) -sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(sbindir) + test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)" @list='$(sbin_PROGRAMS)'; for p in $$list; do \ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ if test -f $$p \ ; then \ f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \ + echo " $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(sbindir)/$$f'"; \ + $(INSTALL_PROGRAM_ENV) $(sbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(sbindir)/$$f" || exit 1; \ else :; fi; \ done @@ -230,8 +253,8 @@ uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f $(DESTDIR)$(sbindir)/$$f"; \ - rm -f $(DESTDIR)$(sbindir)/$$f; \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$f"; \ done clean-sbinPROGRAMS: @@ -244,7 +267,7 @@ ifplugstatus$(EXEEXT): $(ifplugstatus_OBJECTS) $(ifplugstatus_DEPENDENCIES) $(LINK) $(ifplugstatus_LDFLAGS) $(ifplugstatus_OBJECTS) $(ifplugstatus_LDADD) $(LIBS) mostlyclean-compile: - -rm -f *.$(OBJEXT) core *.core + -rm -f *.$(OBJEXT) distclean-compile: -rm -f *.tab.c @@ -256,36 +279,20 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nlapi.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$< +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \ -@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \ -@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \ -@am__fastdepCC_TRUE@ fi +@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi` +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` uninstall-info-am: -ETAGS = etags -ETAGSFLAGS = - -CTAGS = ctags -CTAGSFLAGS = - -tags: TAGS - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -294,6 +301,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ mkid -fID $$unique +tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -305,10 +313,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) ' { files[$$0] = 1; } \ END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$tags$$unique" \ - || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique - + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) @@ -331,10 +340,6 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - -top_distdir = .. -distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ @@ -348,7 +353,7 @@ distdir: $(DISTFILES) dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ dir="/$$dir"; \ - $(mkinstalldirs) "$(distdir)$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ else \ dir=''; \ fi; \ @@ -367,9 +372,10 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) - installdirs: - $(mkinstalldirs) $(DESTDIR)$(sbindir) + for dir in "$(DESTDIR)$(sbindir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done install: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) install-am install-exec: install-exec-am @@ -390,13 +396,13 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f $(CONFIG_CLEAN_FILES) + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am clean-am: clean-generic clean-sbinPROGRAMS mostlyclean-am @@ -411,6 +417,8 @@ dvi: dvi-am dvi-am: +html: html-am + info: info-am info-am: @@ -446,11 +454,11 @@ uninstall-am: uninstall-info-am uninstall-sbinPROGRAMS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-sbinPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am info \ - info-am install install-am install-data install-data-am \ - install-exec install-exec-am install-info install-info-am \ - install-man install-sbinPROGRAMS install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ + distclean-generic distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-sbinPROGRAMS 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-info-am uninstall-sbinPROGRAMS diff --git a/src/ifplugd.c b/src/ifplugd.c index 3d6abe4..76d4d1a 100644 --- a/src/ifplugd.c +++ b/src/ifplugd.c @@ -1,5 +1,5 @@ /* -*- Mode: C; tab-width: 4; indent-tabs-mode: f; c-basic-offset: 4 -*- */ -/* $Id: ifplugd.c 116 2004-12-19 00:24:29Z lennart $ */ +/* $Id: ifplugd.c 123 2005-06-04 16:07:11Z lennart $ */ /* * This file is part of ifplugd. @@ -61,25 +61,26 @@ #define IFPLUGD_ENV_CURRENT "IFPLUGD_CURRENT" int interface_auto_up = 1, - interface_do_message = 1; + interface_do_message = 1; char *interface = NULL; char *run = SYSCONFDIR"/ifplugd/ifplugd.action"; char *extra_arg = NULL; int polltime = 1, - delay_up = 0, - delay_down = 5; + delay_up = 0, + delay_down = 5; int daemonize = 1, - use_beep = 1, - no_shutdown_script = 0, - wait_on_fork = 0, - wait_on_kill = 0, - use_syslog = 1, - ignore_retval = 0, - initial_down = 0, - use_ifmonitor = 0; + use_beep = 1, + no_startup_script = 0, + no_shutdown_script = 0, + wait_on_fork = 0, + wait_on_kill = 0, + use_syslog = 1, + ignore_retval = 0, + initial_down = 0, + use_ifmonitor = 0; int disabled = 0; @@ -161,9 +162,9 @@ int action(interface_status_t status) { if (_pipe[1] > 2) close(_pipe[1]); - umask(0022); /* Set up a sane umask */ + umask(0022); /* Set up a sane umask */ - execl(run, run, interface, arg, extra_arg, 0); + execl(run, run, interface, arg, extra_arg, (char *) NULL); _exit(EXIT_FAILURE); } @@ -172,7 +173,8 @@ int action(interface_status_t status) { FD_ZERO(&rfds); FD_SET(_pipe[0], &rfds); - FD_SET(sigfd = daemon_signal_fd(), &rfds); + sigfd = daemon_signal_fd(); + FD_SET(sigfd, &rfds); n = 0; @@ -294,9 +296,9 @@ interface_status_t detect_beat(int fd, char*iface) { interface_status_t status; static interface_status_t last_status = (interface_status_t) -1; - if (disabled) - return IFSTATUS_DOWN; - + if (disabled) + return IFSTATUS_DOWN; + if ((status = detect_beat_func(fd, iface)) == IFSTATUS_ERR) status = failure_status; @@ -339,19 +341,19 @@ int welcome_iface(int fd, char *iface) { else daemon_log(LOG_INFO, "%s", txt); - cached_detect_beat_func = NULL; - + cached_detect_beat_func = NULL; + return 0; } int ifmonitor_cb(int b, int index, unsigned short type, const char *name) { - if (!name) - return 0; + if (!name) + return 0; - if (!strcmp(name, interface)) - disabled = !b; + if (!strcmp(name, interface)) + disabled = !b; - return 0; + return 0; } int is_iface_available(int s, char *p) { @@ -399,7 +401,7 @@ void work(void) { case API_MII: detect_beat_func = interface_detect_beat_mii; break; case API_PRIVATE: detect_beat_func = interface_detect_beat_priv; break; case API_WLAN: detect_beat_func = interface_detect_beat_wlan; break; - case API_IFF: detect_beat_func = interface_detect_beat_iff; break; + case API_IFF: detect_beat_func = interface_detect_beat_iff; break; default: detect_beat_func = detect_beat_auto; @@ -407,32 +409,32 @@ void work(void) { break; } - if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { + if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { daemon_log(LOG_ERR, "socket(): %s", strerror(errno)); - goto finish; + goto finish; } - if (use_ifmonitor) { - int b; - if ((b = is_iface_available(fd, interface)) < 0) { - daemon_log(LOG_ERR, "Failed to check interface availabilty!"); - goto finish; - } - - disabled = !b; + if (use_ifmonitor) { + int b; + if ((b = is_iface_available(fd, interface)) < 0) { + daemon_log(LOG_ERR, "Failed to check interface availabilty!"); + goto finish; + } + + disabled = !b; - if (nlapi_open(RTMGRP_LINK) < 0) - goto finish; + if (nlapi_open(RTMGRP_LINK) < 0) + goto finish; - if (ifmonitor_init(ifmonitor_cb) < 0) - goto finish; - } else - disabled = 0; + if (ifmonitor_init(ifmonitor_cb) < 0) + goto finish; + } else + disabled = 0; - if (!disabled) { - if (welcome_iface(fd, interface) < 0) - goto finish; - } + if (!disabled) { + if (welcome_iface(fd, interface) < 0) + goto finish; + } if ((status = detect_beat(fd, interface)) == IFSTATUS_ERR) goto finish; @@ -440,7 +442,7 @@ void work(void) { daemon_log(LOG_INFO, "Initialization complete, link beat %sdetected%s.", status == IFSTATUS_UP ? "" : "not ", use_ifmonitor ? (disabled ? ", interface disabled" : ", interface enabled") : ""); beep(status == IFSTATUS_UP ? 0 : 1); - if (status == IFSTATUS_UP || initial_down) + if ((!no_startup_script && status == IFSTATUS_UP) || initial_down) if (action(status) < 0) goto finish; @@ -451,19 +453,20 @@ void work(void) { } FD_ZERO(&fds); - FD_SET(sigfd = daemon_signal_fd(), &fds); + sigfd = daemon_signal_fd(); + FD_SET(sigfd, &fds); - if (use_ifmonitor) - FD_SET(nlapi_fd, &fds); + if (use_ifmonitor) + FD_SET(nlapi_fd, &fds); for (;;) { interface_status_t s; fd_set qfds = fds; - int d; + int d; struct timeval tv; - tv.tv_sec = polltime; - tv.tv_usec = 0; + tv.tv_sec = polltime; + tv.tv_usec = 0; if (select(FD_SETSIZE, &qfds, NULL, NULL, &tv) < 0) { if (errno == EINTR) @@ -473,55 +476,55 @@ void work(void) { goto finish; } - //daemon_log(LOG_INFO, "select()"); - - d = disabled; - s = status; - - if (use_ifmonitor) { - - if (FD_ISSET(nlapi_fd, &qfds)) { - if (nlapi_work(0) < 0) - goto finish; - } - - if (d && !disabled) { - daemon_log(LOG_INFO, "Interface enabled"); - welcome_iface(fd, interface); - status = IFSTATUS_DOWN; - } - - if (!d && disabled) { - daemon_log(LOG_INFO, "Interface disabled"); - status = IFSTATUS_DOWN; - } - } + //daemon_log(LOG_INFO, "select()"); + + d = disabled; + s = status; + + if (use_ifmonitor) { + + if (FD_ISSET(nlapi_fd, &qfds)) { + if (nlapi_work(0) < 0) + goto finish; + } + + if (d && !disabled) { + daemon_log(LOG_INFO, "Interface enabled"); + welcome_iface(fd, interface); + status = IFSTATUS_DOWN; + } + + if (!d && disabled) { + daemon_log(LOG_INFO, "Interface disabled"); + status = IFSTATUS_DOWN; + } + } if (!paused && !disabled) { - //daemon_log(LOG_INFO, "detect"); + //daemon_log(LOG_INFO, "detect"); if ((status = detect_beat(fd, interface)) == IFSTATUS_ERR) { - if (!use_ifmonitor) - goto finish; - - status = IFSTATUS_DOWN; - } - } - - if (status != s) { - daemon_log(LOG_INFO, "Link beat %s.", status == IFSTATUS_DOWN ? "lost" : "detected"); - beep(status == IFSTATUS_UP ? 0 : 1); - - if (t) - t = 0; - else { - t = time(NULL); - - if (status == IFSTATUS_UP) - t += delay_up; - - if (status == IFSTATUS_DOWN) - t += delay_down; + if (!use_ifmonitor) + goto finish; + + status = IFSTATUS_DOWN; + } + } + + if (status != s) { + daemon_log(LOG_INFO, "Link beat %s.", status == IFSTATUS_DOWN ? "lost" : "detected"); + beep(status == IFSTATUS_UP ? 0 : 1); + + if (t) + t = 0; + else { + t = time(NULL); + + if (status == IFSTATUS_UP) + t += delay_up; + + if (status == IFSTATUS_DOWN) + t += delay_down; } } @@ -548,8 +551,8 @@ void work(void) { case SIGHUP: daemon_log(LOG_INFO, "SIGHUP: %s, link detected on %s: %s", paused ? "Suspended" : "Running", interface, status == IFSTATUS_DOWN ? "no" : "yes"); - if (use_ifmonitor) - daemon_log(LOG_INFO, "SIGHUP: Interface %s", disabled ? "disabled" : "enabled"); + if (use_ifmonitor) + daemon_log(LOG_INFO, "SIGHUP: Interface %s", disabled ? "disabled" : "enabled"); break; case SIGUSR1: @@ -570,7 +573,7 @@ void work(void) { } } - if (t && t < time(NULL)) { + if (t && t < time(NULL)) { t = 0; if (action(status) < 0) @@ -579,7 +582,7 @@ void work(void) { } cleanup: - if (!no_shutdown_script && (status == IFSTATUS_UP || (status == IFSTATUS_DOWN && t))) { + if (!no_shutdown_script && (status == IFSTATUS_UP || (status == IFSTATUS_DOWN && t))) { setenv(IFPLUGD_ENV_PREVIOUS, strstatus(status), 1); setenv(IFPLUGD_ENV_CURRENT, strstatus(-1), 1); action(IFSTATUS_DOWN); @@ -591,9 +594,9 @@ finish: if (fd >= 0) close(fd); - if (use_ifmonitor) - nlapi_close(); - + if (use_ifmonitor) + nlapi_close(); + if (send_retval && daemonize && wait_on_fork) daemon_retval_send(255); @@ -611,7 +614,7 @@ void usage(char *p) { case API_MII: m = "mii"; break; case API_PRIVATE: m = "priv"; break; case API_WLAN: m = "wlan"; break; - case API_IFF: m = "iff"; break; + case API_IFF: m = "iff"; break; default: m = "auto"; } @@ -619,8 +622,8 @@ void usage(char *p) { p = strchr(p, '/')+1; printf("%s -- Network Interface Plug Detection Daemon\n\n" - "Usage: %s [options]\n\n" - "Options:\n" + "Usage: %s [options]\n\n" + "Options:\n" " -a --no-auto Do not enable interface automatically (%s)\n" " -n --no-daemon Do not daemonize (for debugging) (%s)\n" " -s --no-syslog Do not use syslog, use stderr instead (for debugging) (%s)\n" @@ -634,15 +637,16 @@ void usage(char *p) { " -u --delay-up=SECS Specify delay for configuring interface (%i)\n" " -d --delay-down=SECS Specify delay for deconfiguring interface (%i)\n" " -m --api-mode=MODE Force API mode (mii, priv, ethtool, wlan, auto) (%s)\n" + " -p --no-startup Don't run script on daemon startup (%s)\n" " -q --no-shutdown Don't run script on daemon quit (%s)\n" - " -l --initial-down Run \"down\" script on startup if now cable is detected (%s)\n" + " -l --initial-down Run \"down\" script on startup if no cable is detected (%s)\n" " -w --wait-on-fork Wait until daemon fork finished (%s)\n" - " -W --wait-on-kill When run with -k, wait until the daemon died (%s)\n" - " -x --extra-arg Specify an extra argument for action script\n" - " -M --monitor Use interface monitoring (%s)\n" + " -W --wait-on-kill When run with -k, wait until the daemon died (%s)\n" + " -x --extra-arg Specify an extra argument for action script\n" + " -M --monitor Use interface monitoring (%s)\n" " -h --help Show this help\n" " -k --kill Kill a running daemon\n" - " -c --check-running Check if a daemon is currently running\n" + " -c --check-running Check if a daemon is currently running\n" " -v --version Show version\n" " -S --suspend Suspend running daemon\n" " -R --resume Resume running daemon\n" @@ -661,11 +665,12 @@ void usage(char *p) { delay_up, delay_down, m, + no_startup_script ? "on" : "off", no_shutdown_script ? "on" : "off", - initial_down ? "on" : "off", + initial_down ? "on" : "off", wait_on_fork ? "on" : "off", - wait_on_kill ? "on" : "off", - use_ifmonitor ? "on" : "off"); + wait_on_kill ? "on" : "off", + use_ifmonitor ? "on" : "off"); } void parse_args(int argc, char *argv[]) { @@ -684,7 +689,8 @@ void parse_args(int argc, char *argv[]) { {"delay-down", required_argument, 0, 'd'}, {"api-mode", required_argument, 0, 'm'}, {"wait-on-fork", no_argument, 0, 'w'}, - {"wait-on-kill", no_argument, 0, 'W'}, + {"wait-on-kill", no_argument, 0, 'W'}, + {"no-startup", no_argument, 0, 'p'}, {"no-shutdown", no_argument, 0, 'q'}, {"help", no_argument, 0, 'h'}, {"kill", no_argument, 0, 'k'}, @@ -694,8 +700,8 @@ void parse_args(int argc, char *argv[]) { {"suspend", no_argument, 0, 'S'}, {"resume", no_argument, 0, 'R'}, {"info", no_argument, 0, 'z'}, - {"inital-down", no_argument, 0, 'l'}, - {"monitor", no_argument, 0, 'M'}, + {"initial-down", no_argument, 0, 'l'}, + {"monitor", no_argument, 0, 'M'}, {0, 0, 0, 0} }; int option_index = 0; @@ -704,7 +710,7 @@ void parse_args(int argc, char *argv[]) { for (;;) { int c; - if ((c = getopt_long(argc, argv, "asni:r:t:u:d:hkbfFvm:qwx:cISRzlMW", long_options, &option_index)) < 0) + if ((c = getopt_long(argc, argv, "asni:r:t:u:d:hkbfFvm:pqwx:cISRzlMW", long_options, &option_index)) < 0) break; switch (c) { @@ -718,8 +724,8 @@ void parse_args(int argc, char *argv[]) { daemonize = !daemonize; break; case 'i' : - if (interface) - free(interface); + if (interface) + free(interface); interface = strdup(optarg); break; case 'r': @@ -766,25 +772,28 @@ void parse_args(int argc, char *argv[]) { case 'p': api_mode = API_PRIVATE; break; case 'w': api_mode = API_WLAN; break; case 'a': api_mode = API_AUTO; break; - case 'i': api_mode = API_IFF; break; + case 'i': api_mode = API_IFF; break; default: daemon_log(LOG_ERR, "Unknown API mode: %s", optarg); exit(2); } break; + case 'p': + no_startup_script = !no_startup_script; + break; case 'q': no_shutdown_script = !no_shutdown_script; break; - case 'l': - initial_down = !initial_down; - break; + case 'l': + initial_down = !initial_down; + break; case 'w': wait_on_fork = !wait_on_fork; break; case 'W': wait_on_kill = !wait_on_kill; break; - case 'x': + case 'x': extra_arg = strdup(optarg); break; case 'S': @@ -796,9 +805,9 @@ void parse_args(int argc, char *argv[]) { case 'z': _info = 1; break; - case 'M': - use_ifmonitor = !use_ifmonitor; - break; + case 'M': + use_ifmonitor = !use_ifmonitor; + break; default: daemon_log(LOG_ERR, "Unknown parameter."); exit(1); @@ -806,8 +815,8 @@ void parse_args(int argc, char *argv[]) { } - if (!interface) - interface = strdup("eth0"); + if (!interface) + interface = strdup("eth0"); if (!use_syslog) daemon_log_use = DAEMON_LOG_STDERR; @@ -818,14 +827,14 @@ void parse_args(int argc, char *argv[]) { } if (_kill || _resume || _suspend || _info) { - int rv; - - if (_kill && wait_on_kill) - rv = daemon_pid_file_kill_wait(SIGINT, 5); - else - rv = daemon_pid_file_kill(_kill ? SIGINT : (_resume ? SIGUSR2 : (_info ? SIGHUP : SIGUSR1))); - - if (rv < 0) { + int rv; + + if (_kill && wait_on_kill) + rv = daemon_pid_file_kill_wait(SIGINT, 5); + else + rv = daemon_pid_file_kill(_kill ? SIGINT : (_resume ? SIGUSR2 : (_info ? SIGHUP : SIGUSR1))); + + if (rv < 0) { daemon_log(LOG_ERR, "Failed to kill daemon. (%s)", strerror(errno)); exit(6); } @@ -849,11 +858,11 @@ void parse_args(int argc, char *argv[]) { if (pid == (pid_t) -1 || pid == 0) { printf("ifplugd not running.\n"); - exit(255); - } else { + exit(255); + } else { printf("ifplugd process for device %s running as pid %u.\n", interface, pid); - exit(0); - } + exit(0); + } } } @@ -880,7 +889,7 @@ int main(int argc, char* argv[]) { return 2; } - if (daemon_pid_file_is_running() >= 0) { + if (daemon_pid_file_is_running() >= 0) { daemon_log(LOG_ERR, "Sorry, there is already an instance of ifplugd for %s running.", interface); return 4; } @@ -908,9 +917,9 @@ int main(int argc, char* argv[]) { kill(pid, SIGTERM); } - if (c > 3) - daemon_log(LOG_ERR, "Daemon failed with error condition #%i. See syslog for details", c); - + if (c > 3) + daemon_log(LOG_ERR, "Daemon failed with error condition #%i. See syslog for details", c); + return c; } } diff --git a/src/svn-revision.h b/src/svn-revision.h index fb7e2bc..05f4aa6 100644 --- a/src/svn-revision.h +++ b/src/svn-revision.h @@ -1,4 +1,4 @@ #ifndef foosvnrevisionhfoo #define foosvnrevisionhfoo -#define SVN_REVISION "114" +#define SVN_REVISION "124" #endif |