build fixes

git-svn-id: file:///home/lennart/svn/public/ifplugd/trunk@39 2bf48fe7-cfc1-0310-909f-d9042e1e0fef

8 files changed, 80 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 522d54e..668868c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,3 +33,9 @@ homepage:
 	cp *.tar.gz $$HOME/homepage/lennart/projects/ifplugd
 	cp doc/README.html doc/style.css doc/NEWS $$HOME/homepage/lennart/projects/ifplugd
 	cp $$HOME/homepage/lennart/projects/ifplugd/README.html $$HOME/homepage/lennart/projects/ifplugd/index.html
+
+
+distcleancheck:
+        @:
+	
+.PHONY: homepage distcleancheck
diff --git a/bootstrap.sh b/bootstrap.sh
index ea58438..583cdea 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -24,7 +24,7 @@ if [ "x$1" = "xam" ] ; then
 else 
     set -ex
 
-    make maintainer-clean || true
+#    make maintainer-clean || true
 
     rm -rf autom4te.cache
     rm -f config.cache
diff --git a/configure.ac b/configure.ac
index 596e9bc..429636d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 AC_PREREQ(2.57)
-AC_INIT([ifplugd], [0.16], [mzvscyhtq@itaparica.org])
+AC_INIT([ifplugd], [0.17], [mzvscyhtq (at) itaparica (dot) org])
 AC_CONFIG_SRCDIR([src/ifplugd.c])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign -Wall])
@@ -29,6 +29,8 @@ AM_INIT_AUTOMAKE([foreign -Wall])
 AC_PROG_CXX
 AC_PROG_CC
 
+AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/ifplugd/])
+
 # If using GCC specifiy some additional parameters
 if test "x$GCC" = "xyes" ; then
    CFLAGS="$CFLAGS -pipe -Wall"
@@ -62,7 +64,7 @@ AC_C_VOLATILE
 AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_MALLOC
+#AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm dup2 memset select setenv socket strchr strdup strerror strrchr strspn])
@@ -106,5 +108,25 @@ fi
 
 AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
 
+# subversion release number generation
+AC_ARG_ENABLE(subversion,
+        AC_HELP_STRING([--disable-subversion], [Disable rebuilding of svn-release.h]),
+[case "${enableval}" in
+  yes) subversion=yes ;;
+  no)  subversion=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --disable-subversion]) ;;
+esac],[subversion=yes])
+                                                                                                                                                                                      
+if test x$subversion = xyes ; then
+   AC_CHECK_PROG(have_subversion, svn, yes, no)
+                                                                                                                                                                                      
+   if test x$have_subversion = xno ; then
+     AC_MSG_WARN([*** Not rebuilding svn-release.h as subversion is not found ***])
+     subversion=no
+   fi
+fi
+                                                                                                                                                                                      
+AM_CONDITIONAL([USE_SUBVERSION], [test "x$subversion" = xyes])
+
 AC_CONFIG_FILES([src/Makefile Makefile man/Makefile conf/Makefile doc/Makefile doc/README.html patches/Makefile ifplugd.spec])
 AC_OUTPUT
diff --git a/doc/NEWS b/doc/NEWS
index a3f4274..5c6192e 100644
--- a/doc/NEWS
+++ b/doc/NEWS
@@ -1,6 +1,12 @@
-0.16 :: ... :: SVN ...
+0.17 :: 13 Sep 2003 :: SVN
+        Init script update
+	compativility fix for gcc 2.95
+
+0.16 :: 13. Aug 2003 :: SVN 31
 	Spec file update
 	Build fixes
+	monitor mode
+	init script update
 
 0.15 :: 10. Jul 2003 :: SVN 16
 	umask fix
diff --git a/doc/README.html.in b/doc/README.html.in
index 61aa8a7..730d256 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -260,6 +260,8 @@ manpage</p>
 
 <p>The current release is <a href="http://www.stud.uni-hamburg.de/~lennart/projects/ifplugd/ifplugd-@PACKAGE_VERSION@.tar.gz">@PACKAGE_VERSION@</a></p>
 
+<p>Get <tt>ifplugd</tt>'s development sources from the <a href="http://subversion.tigris.org/">Subversion</a> <a href="https://seth.intheinter.net:8081/svn/ifplugd/">repository</a>.</p>
+
 <p>You may find a mostly up to date Debian package of <tt>ifplugd</tt> on the <a href="http://packages.debian.org/cgi-bin/search_packages.pl?keywords=ifplugd&amp;searchon=names&amp;subword=1&amp;version=all&amp;release=all">Debian package repository</a>.</p>
 
 <p>Packages for Mandrake Linux may be found in the Cooker distribution; Gentoo packages are available as well</p>
diff --git a/doc/style.css b/doc/style.css
index 71ccfe0..85c060c 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -1,4 +1,23 @@
 /* $Id: style.css 8 2003-07-05 15:14:33Z 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * ifplugd 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 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; } 
 a:link, a:visited { color: #900000; }       
 p { margin-left: 0.5cm; margin-right: 0.5cm; }
diff --git a/man/ifplugd.conf.5.xml.in b/man/ifplugd.conf.5.xml.in
index 8b580cd..ac25885 100644
--- a/man/ifplugd.conf.5.xml.in
+++ b/man/ifplugd.conf.5.xml.in
@@ -30,8 +30,8 @@
 	<description>
 	  <p>ifplugd.conf is the configuration file for ifplugd. It is a
 	  shell script that is sourced by the init script starting
-	  the daemon. It shall be used to set two environment variables which
-	  are interpreted by the init script.</p>
+	  the daemon. It shall be used to set environment variables which
+	  are interpreted by the init script:</p>
 	</description>
 	
 	<options>
@@ -55,6 +55,12 @@
 		section="8"/> for further information.</p></optdesc>
 	  </option>
 
+
+	  <option>
+	       <p><opt>ARGS_</opt><arg>iface</arg></p>
+                  
+	       <optdesc><p>If specified for an interface this variable takes precedence over ARGS. This may be useful if more than one network device is present.</p></optdesc>
+	  </option>
 	</options>
 	
 	<section name="See also">
diff --git a/src/Makefile.am b/src/Makefile.am
index 87176bc..63b0f6a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,8 +16,6 @@
 # along with ifplugd; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-MAINTAINERCLEANFILES = svn-revision.h
-
 AM_CFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\""
 
 sbin_PROGRAMS = ifplugd ifstatus
@@ -27,20 +25,27 @@ ifplugd_SOURCES = ifplugd.c \
 			ethtool-kernel.h ethtool-local.h \
 			wireless.h wireless.15.h \
 			ifmonitor.h ifmonitor.c \
-			nlapi.h nlapi.c
+			nlapi.h nlapi.c \
+			svn-revision.h
 
 ifstatus_SOURCES = ifstatus.c \
 			interface.c interface.h \
 			ethtool-kernel.h ethtool-local.h \
-			wireless.h wireless.15.h
+			wireless.h wireless.15.h \
+			svn-revision.h
 
-EXTRA_DIST = svn-revision.h
+MAINTAINERCLEANFILES =
+BUILT_SOURCES =
 
-BUILT_SOURCES = svn-revision.h
+if USE_SUBVERSION
+MAINTAINERCLEANFILES += svn-revision.h
+BUILT_SOURCES += svn-revision.h
+endif
 
 ifstatus.$(OBJEXT): svn-revision.h
 ifplugd.$(OBJEXT): svn-revision.h
 
+if USE_SUBVERSION
 svn-revision.h: Makefile
 	if test -d "$(top_srcdir)/.svn" ; then \
 		if REV=`svn info "$(top_srcdir)" | grep ^Revision | cut -f2 -d" "` 2> /dev/null ; then \
@@ -53,3 +58,5 @@ svnkeywords:
 	svn propset svn:keywords Id *.c *.h Makefile.am
 
 .PHONY: svnkeywords
+endif
+