Make it an autoconf pacakage

git-svn-id: file:///home/lennart/svn/public/ivam2/trunk@25 dbf6933d-3bce-0310-9bcc-ed052ba35b35

51 files changed, 2012 insertions, 51 deletions

diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..1e62f0e
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,40 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+EXTRA_DIST = bootstrap.sh README LICENSE
+SUBDIRS=src clients ulaw conf doc
+
+MAINTAINERCLEANFILES = README
+noinst_DATA = README
+
+README:
+	rm -f README
+#	$(MAKE) -C doc README
+	ln -sf doc/README README
+
+homepage: dist
+	test -d $$HOME/homepage/lennart
+	mkdir -p $$HOME/homepage/lennart/projects/ivam2
+	cp *.tar.gz $$HOME/homepage/lennart/projects/ivam2
+	cp doc/README.html doc/style.css $$HOME/homepage/lennart/projects/ivam2
+	cp $$HOME/homepage/lennart/projects/ivam2/README.html $$HOME/homepage/lennart/projects/ivam2/index.html
+
+distcleancheck:
+	@:
+
+.PHONY: homepage distcleancheck
diff --git a/bootstrap.sh b/bootstrap.sh
new file mode 100755
index 0000000..c95f2ff
--- /dev/null
+++ b/bootstrap.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# $Id$
+
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+run_versioned() {
+    local P
+    type -p "$1-$2" &> /dev/null && P="$1-$2" || local P="$1"
+
+    shift 2
+    "$P" "$@"
+}
+
+if [ "x$1" = "xam" ] ; then
+    set -ex
+    run_versioned automake 1.7 -a -c
+    ./config.status
+else 
+    set -ex
+    rm -rf autom4te.cache
+    rm -f config.cache
+
+    run_versioned aclocal 1.7
+    autoheader
+    run_versioned automake 1.7 -a -c
+    autoconf -Wall
+
+    ./configure --sysconfdir=/etc "$@"
+
+    make clean
+fi
diff --git a/clients/Makefile.am b/clients/Makefile.am
new file mode 100644
index 0000000..5e6e347
--- /dev/null
+++ b/clients/Makefile.am
@@ -0,0 +1,30 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+bin_SCRIPTS=ivam-autobox ivam-createvb ivam-echo ivam-newmessage ivam-newvoicebox ivam-play ivam-voicebox
+
+STATICSCRIPTS=ivamApi.py ivamCore.py ivamDefs.py ivamPipeConnector.py ivamShbufConnector.py ivamUtil.py ivamVoiceBox.py
+python_PYTHON=$(STATICSCRIPTS) ivamDefs.py
+
+EXTRA_DIST=$(bin_SCRIPTS) $(STATICSCRIPTS)
+CLEANFILES = ivamDefs.py
+
+ivamDefs.py: ivamDefs.py.in Makefile
+	sed -e 's,@SPOOLDIR\@,$(SPOOLDIR),g' \
+		-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
+		-e 's,@bindir\@,$(bindir),g' $< > $@
diff --git a/clients/ivam-autobox b/clients/ivam-autobox
index 4b043d2..49eaf22 100755
--- a/clients/ivam-autobox
+++ b/clients/ivam-autobox
@@ -1,5 +1,23 @@
 #!/usr/bin/python
 
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
 import sys, os, getopt
 
 from ivamCore import log
@@ -20,7 +38,7 @@ def parseArgs(vb, argv):
     recordTime = 60
     pin = "-"
     email = "root"
-    notifyScript = "newvoicebox"
+    notifyScript = "ivam-newvoicebox"
 
     for o, a in opts:
         if o in ("-d", "--debug"):
diff --git a/clients/ivam-createvb b/clients/ivam-createvb
index 7365db6..1344b2c 100755
--- a/clients/ivam-createvb
+++ b/clients/ivam-createvb
@@ -1,6 +1,25 @@
 #!/usr/bin/python
 
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+import sys
 import ivamVoiceBox
 
-ivamVoiceBox.setupVoiceBox("lennart")
+ivamVoiceBox.setupVoiceBox(sys.argv[1])
 
diff --git a/clients/ivam-echo b/clients/ivam-echo
index b0f3e40..fe0e379 100755
--- a/clients/ivam-echo
+++ b/clients/ivam-echo
@@ -1,3 +1,21 @@
 #!/bin/sh
 
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
 exec cat
diff --git a/clients/ivam-newmessage b/clients/ivam-newmessage
index b5101a5..9fb3042 100755
--- a/clients/ivam-newmessage
+++ b/clients/ivam-newmessage
@@ -2,20 +2,20 @@
 
 # $Id$
 #
-# This file is part of ivam. 
-# 
-# asd is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
+# This file is part of ivam2.
 #
-# asd 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.
+# ivam2 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.
+#
+# ivam2 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 ivam; if not, write to the Free Software Foundation,
+# along with ivam2; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 
diff --git a/clients/ivam-newvoicebox b/clients/ivam-newvoicebox
index 0f6ccde..e01f2a4 100755
--- a/clients/ivam-newvoicebox
+++ b/clients/ivam-newvoicebox
@@ -2,23 +2,22 @@
 
 # $Id$
 #
-# This file is part of ivam. 
-# 
-# asd is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your
-# option) any later version.
+# This file is part of ivam2.
 #
-# asd 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.
+# ivam2 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.
+#
+# ivam2 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 ivam; if not, write to the Free Software Foundation,
+# along with ivam2; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-
 if [ ! -d "$1" ] ; then
     echo "New spool directory not found or not readable." > /dev/stderr
     exit 1
diff --git a/clients/ivam-play b/clients/ivam-play
index 043ffbe..96fde4e 100755
--- a/clients/ivam-play
+++ b/clients/ivam-play
@@ -1,3 +1,21 @@
 #!/bin/sh
 
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
 exec zcat -f "$1"
diff --git a/clients/ivam-voicebox b/clients/ivam-voicebox
index be2c2eb..e0f398e 100755
--- a/clients/ivam-voicebox
+++ b/clients/ivam-voicebox
@@ -1,5 +1,23 @@
 #!/usr/bin/python
 
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
 import sys, os, getopt
 
 from ivamCore import log
diff --git a/clients/ivamApi.py b/clients/ivamApi.py
index 97534ff..6646b84 100644
--- a/clients/ivamApi.py
+++ b/clients/ivamApi.py
@@ -1,3 +1,20 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 class Processor:
 
diff --git a/clients/ivamCore.py b/clients/ivamCore.py
index 972c156..48f38dc 100644
--- a/clients/ivamCore.py
+++ b/clients/ivamCore.py
@@ -1,3 +1,20 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 import sys, os
 
diff --git a/clients/ivamDefs.py b/clients/ivamDefs.py
deleted file mode 100644
index c161467..0000000
--- a/clients/ivamDefs.py
+++ /dev/null
@@ -1,5 +0,0 @@
-
-spoolDirectory = "/home/lennart/tmp/ivam-spool"
-ulawDirectory = "/home/lennart/projects/ivam-reloaded/ulaw"
-shareDirectory = "/home/lennart/projects/ivam-reloaded/doc"
-binDirectory = "/home/lennart/projects/ivam-reloaded/clients"
diff --git a/clients/ivamDefs.py.in b/clients/ivamDefs.py.in
new file mode 100644
index 0000000..08edbb7
--- /dev/null
+++ b/clients/ivamDefs.py.in
@@ -0,0 +1,22 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+spoolDirectory = "@SPOOLDIR@"
+ulawDirectory = "@pkgdatadir@/ulaw"
+shareDirectory = "@pkgdatadir@"
+binDirectory = "@bindir@"
diff --git a/clients/ivamPipeConnector.py b/clients/ivamPipeConnector.py
index 91445ba..7d3cb5f 100644
--- a/clients/ivamPipeConnector.py
+++ b/clients/ivamPipeConnector.py
@@ -1,3 +1,20 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 import os, sys, time, select, signal, gzip
 
diff --git a/clients/ivamShbufConnector.py b/clients/ivamShbufConnector.py
index feef521..b979be9 100644
--- a/clients/ivamShbufConnector.py
+++ b/clients/ivamShbufConnector.py
@@ -1,3 +1,20 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 from ivamApi import ivamConnector
 
diff --git a/clients/ivamUtil.py b/clients/ivamUtil.py
index 053638e..1e5093e 100644
--- a/clients/ivamUtil.py
+++ b/clients/ivamUtil.py
@@ -1,3 +1,20 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 import gzip
 
diff --git a/clients/ivamVoiceBox.py b/clients/ivamVoiceBox.py
index b05de03..75601b9 100644
--- a/clients/ivamVoiceBox.py
+++ b/clients/ivamVoiceBox.py
@@ -1,3 +1,20 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
 import getopt, sys, os, time, re
 import ivamApi, ivamCore, ivamDefs
diff --git a/conf/Makefile.am b/conf/Makefile.am
new file mode 100644
index 0000000..e5460ee
--- /dev/null
+++ b/conf/Makefile.am
@@ -0,0 +1,36 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+pkgsysconfdir=$(sysconfdir)/@PACKAGE@
+sysinitdir=@SYSINITDIR@
+
+pkgsysconf_DATA = msntab ivam2.conf
+
+noinst_DATA = ivam2.init
+EXTRA_DIST = ivam2.init.in $(pkgsysconf_DATA)
+CLEANFILES = ivam2.init
+
+ivam2.init: ivam2.init.in Makefile
+	sed -e 's,@pkgsysconfdir\@,$(sysconfdir)/@PACKAGE@,g' -e 's,@sbindir\@,$(sbindir),g' $< > $@
+	chmod 755 $@
+
+install-data-local: ivam2.init
+	$(INSTALL) -b -D -m755 ivam2.init ${DESTDIR}${sysinitdir}/ivam2
+
+uninstall-local:
+	rm -f ${DESTDIR}${sysconfdir}/init.d/ivam2
diff --git a/conf/ivam2.conf b/conf/ivam2.conf
new file mode 100644
index 0000000..7ad562f
--- /dev/null
+++ b/conf/ivam2.conf
@@ -0,0 +1,27 @@
+# -*-sh-*-
+# $Id$
+
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+# ivam2 configuration file
+
+# Please note that this is a bourne shell fragment sourced by the
+# init script of ivam2.
+
+# Additional parameters for ivam2.
+# (Run "ivam2 -h" for further information.)
+ARGS=""
diff --git a/conf/ivam2.init.in b/conf/ivam2.init.in
new file mode 100755
index 0000000..680d210
--- /dev/null
+++ b/conf/ivam2.init.in
@@ -0,0 +1,60 @@
+#!/bin/bash
+# $Id$
+
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+CFG=@pkgsysconfdir@/ivam2.conf
+
+IVAMD=@sbindir@/ivamd
+test -x $IVAMD || exit 0
+
+if [ `id -u` != "0" ] && [ "$1" = "start" -o "$1" = "stop" ] ; then
+  echo "You must be root to start, stop or restart ivamd."
+  exit 1
+fi
+
+[ -f $CFG ] && . $CFG
+
+case "$1" in
+    start)
+        echo -n "Starting ISDN Voice Box Answering Machine: "
+        $IVAMD "$ARGS" && echo "ivamd"
+        ;;
+    stop)
+        echo -n "Stopping ISDN Voice Box Answering Machine: "
+        $IVAMD -k && ( rm -f /var/run/ivamd.pid ; echo "ivamd" )
+        
+        ;;
+    status)
+        $IVAMD -c
+        ;;
+    reload)
+        echo -n "Reloading ISDN Voice Box Answering Machine: "
+        $IVAMD --reload && echo "ivamd"
+        ;;
+
+    force-reload|restart)
+        $0 stop
+        sleep 3
+        $0 start
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
+        exit 1
+esac
+
+exit 0
diff --git a/conf/msntab b/conf/msntab
index 16d8e5e..41a9973 100644
--- a/conf/msntab
+++ b/conf/msntab
@@ -1,3 +1,21 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
 # local MSN     remote MSN      options         action
 
 #41264179         *        rings=0,pipehack       ivam-autobox
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..b9b76bd
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,181 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+# $Id$
+
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+AC_PREREQ(2.58)
+AC_INIT([ivam2],[0.1],[mzvinzgjb (at) 0pointer (dot) de])
+AC_CONFIG_SRCDIR([src/main.c])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign -Wall])
+
+AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/ivam2/])
+
+if type -p stow > /dev/null && test -d /usr/local/stow ; then
+   AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***])
+   ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+else
+   ac_default_prefix="/usr/local"
+fi
+
+# Checks for programs.
+AC_PROG_CC
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AM_PATH_PYTHON
+
+# If using GCC specifiy some additional parameters
+if test "x$GCC" = "xyes" ; then
+   CFLAGS="$CFLAGS -pipe -Wall"
+fi
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stddef.h stdlib.h string.h sys/socket.h sys/time.h termios.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_MODE_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_HEADER_TIME
+
+# Checks for library functions.
+AC_REPLACE_FNMATCH
+AC_FUNC_FORK
+AC_FUNC_MALLOC
+AC_TYPE_SIGNAL
+AC_FUNC_STAT
+AC_CHECK_FUNCS([dup2 gettimeofday memset mkfifo rmdir setenv strchr strcspn strdup strerror strrchr strspn])
+
+PKG_CHECK_MODULES(LIBDAEMON, [ libdaemon >= 0.4 ])
+AC_SUBST(LIBDAEMON_CFLAGS)
+PKG_CHECK_MODULES(LIBOOP, [ liboop >= 1.0 ])
+AC_SUBST(LIBOOP_LIBS)
+
+# Init script location
+AC_ARG_WITH(initdir, AS_HELP_STRING(--with-initdir=DIR,Install init script in DIR (system dependent default)))
+
+test "x$with_initdir" = xyes -o "x$with_initdir" = xno && with_initdir=
+
+if test "x$with_initdir" = x ; then
+    if test -d /etc/init.d ; then
+        SYSINITDIR=/etc/init.d
+    else
+    	if test -d /etc/rc.d/init.d ; then
+        	SYSINITDIR=/etc/rc.d/init.d
+	else
+        	AC_MSG_ERROR([missing --with-initdir=DIR])
+	fi
+    fi
+else
+   SYSINITDIR="$with_initdir"
+fi
+
+AC_MSG_NOTICE([*** Init sript will be installed in $SYSINITDIR ***])
+AC_SUBST(SYSINITDIR)
+
+# Where to place the spool directory
+AC_ARG_WITH(spooldir, AS_HELP_STRING(--with-spooldir=DIR,The $PACKAGE spool directory (/var/spool/$PACKAGE)))
+
+if test "x$with_spooldir" = xyes -o "x$with_spooldir" = xno -o "x$with_spooldir" = x ; then
+    SPOOLDIR="/var/spool/$PACKAGE"
+else
+    SPOOLDIR="$with_spooldir"
+fi
+
+AC_MSG_NOTICE([*** Spool directory is $SPOOLDIR ***])
+AC_SUBST(SPOOLDIR)
+
+# Where to place the UUCP lock directory
+AC_ARG_WITH(lockdir, AS_HELP_STRING(--with-lockdir=DIR,The UUCP lock directory (/var/lock)))
+
+if test "x$with_lockdir" = xyes -o "x$with_lockdir" = xno -o "x$with_lockdir" = x ; then
+    LOCKDIR="/var/lock"
+else
+    LOCKDIR="$with_lockdir"
+fi
+
+AC_MSG_NOTICE([*** UUCP lock directory is $LOCKDIR ***])
+AC_SUBST(LOCKDIR)
+
+# LYNX documentation generation
+AC_ARG_ENABLE(lynx,
+        AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation),
+[case "${enableval}" in
+  yes) lynx=yes ;;
+  no)  lynx=no ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;;
+esac],[lynx=yes])
+
+if test x$lynx = xyes ; then
+   AC_CHECK_PROG(have_lynx, lynx, yes, no)
+
+   if test x$have_lynx = xno ; then
+     AC_MSG_ERROR([*** Sorry, you have to install lynx or use --disable-lynx ***])
+   fi
+fi
+
+AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes])
+
+# XMLTOMAN manpage generation
+AC_ARG_ENABLE(xmltoman,
+        AS_HELP_STRING(--disable-xmltoman,Disable rebuilding of man pages with xmltoman),
+[case "${enableval}" in
+  yes) xmltoman=yes ;;
+  no)  xmltoman=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --disable-xmltoman]) ;;
+esac],[xmltoman=yes])
+
+if test x$xmltoman = xyes ; then
+   AC_CHECK_PROG(have_xmltoman, xmltoman, yes, no)
+
+   if test x$have_xmltoman = xno ; then
+     AC_MSG_WARN([*** Not rebuilding man pages as xmltoman is not found ***])
+     xmltoman=no
+   fi
+fi
+
+AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes])
+
+# gengetopt command line parser generation
+AC_ARG_ENABLE(gengetopt,
+        AS_HELP_STRING(--disable-gengetopt,Disable rebuilding of command line parser with gengetopt),
+[case "${enableval}" in
+  yes) gengetopt=yes ;;
+  no)  gengetopt=no ;;
+  *) AC_MSG_ERROR([bad value ${enableval} for --disable-gengetopt]) ;;
+esac],[gengetopt=yes])
+
+if test x$gengetopt = xyes ; then
+   AC_CHECK_PROG(have_gengetopt, gengetopt, yes, no)
+
+   if test x$have_gengetopt = xno ; then
+     AC_MSG_WARN([*** Not rebuilding command line parser as gengetopt is not found ***])
+     gengetopt=no
+   fi
+fi
+
+AM_CONDITIONAL([USE_GENGETOPT], [test "x$gengetopt" = xyes])
+
+AC_CONFIG_FILES([Makefile src/Makefile clients/Makefile ulaw/Makefile doc/Makefile conf/Makefile])
+AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..380076c
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,19 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+pkgdata_DATA = README.VoiceBox
diff --git a/doc/README b/doc/README
new file mode 100644
index 0000000..1fc537f
--- /dev/null
+++ b/doc/README
@@ -0,0 +1 @@
+Not much yet
diff --git a/src/Makefile b/src/Makefile
index 8dcb48e..5e2f44d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,736 @@
-CC=gcc
-CFLAGS=`pkg-config --cflags libdaemon liboop` -Wall -O0 -pipe -g
-LIBS=`pkg-config --libs libdaemon liboop` -Wall -O0 -pipe -g
+# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# src/Makefile.  Generated from Makefile.in by configure.
 
-ivamd: modem.o main.o modemman.o buffio.o exec.o dle.o lock.o util.o msntab.o timevalarith.o dtmffifo.o cmdline.o
-	$(CC) $(LIBS) -o $@ $^
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# 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.
 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-cmdline.c cmdline.h: ivamd.ggo
-	gengetopt < $<
 
-clean:
-	rm -f *.o ivamd
 
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+srcdir = .
+top_srcdir = ..
+
+pkgdatadir = $(datadir)/ivam2
+pkglibdir = $(libdir)/ivam2
+pkgincludedir = $(includedir)/ivam2
+top_builddir = ..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = /usr/bin/install -c
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+am__append_1 = cmdline.c cmdline.h
+am__append_2 = cmdline.c cmdline.h
+ACLOCAL = ${SHELL} /home/lennart/projects/ivam2/missing --run aclocal-1.7
+ALLOCA = 
+AMDEP_FALSE = #
+AMDEP_TRUE = 
+AMTAR = ${SHELL} /home/lennart/projects/ivam2/missing --run tar
+AUTOCONF = ${SHELL} /home/lennart/projects/ivam2/missing --run autoconf
+AUTOHEADER = ${SHELL} /home/lennart/projects/ivam2/missing --run autoheader
+AUTOMAKE = ${SHELL} /home/lennart/projects/ivam2/missing --run automake-1.7
+AWK = gawk
+CC = gcc
+CCDEPMODE = depmode=gcc3
+CFLAGS = -g -O2 -pipe -Wall
+CPP = gcc -E
+CPPFLAGS = 
+CYGPATH_W = echo
+DEFS = -DHAVE_CONFIG_H
+DEPDIR = .deps
+ECHO_C = 
+ECHO_N = -n
+ECHO_T = 
+EGREP = grep -E
+EXEEXT = 
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_SCRIPT = ${INSTALL}
+INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
+LDFLAGS = 
+LIBDAEMON_CFLAGS = -D_REENTRANT -I/usr/local/stow/libdaemon-0.4/include/libdaemon  
+LIBDAEMON_LIBS = -L/usr/local/stow/libdaemon-0.4/lib -ldaemon  
+LIBOBJS = 
+LIBOOP_CFLAGS = -D_REENTRANT -I/home/lennart/usr/stow/liboop-dev/include  
+LIBOOP_LIBS = -L/home/lennart/usr/stow/liboop-dev/lib -lpthread -loop  
+LIBS = 
+LN_S = ln -s
+LOCKDIR = /var/lock
+LTLIBOBJS = 
+MAKEINFO = ${SHELL} /home/lennart/projects/ivam2/missing --run makeinfo
+OBJEXT = o
+PACKAGE = ivam2
+PACKAGE_BUGREPORT = mzvinzgjb (at) 0pointer (dot) de
+PACKAGE_NAME = ivam2
+PACKAGE_STRING = ivam2 0.1
+PACKAGE_TARNAME = ivam2
+PACKAGE_URL = http://0pointer.de/lennart/projects/ivam2/
+PACKAGE_VERSION = 0.1
+PATH_SEPARATOR = :
+PKG_CONFIG = /usr/bin/pkg-config
+PYTHON = /usr/bin/python
+PYTHON_EXEC_PREFIX = ${exec_prefix}
+PYTHON_PLATFORM = linux2
+PYTHON_PREFIX = ${prefix}
+PYTHON_VERSION = 2.3
+SET_MAKE = 
+SHELL = /bin/sh
+SPOOLDIR = /var/spool/ivam2
+STRIP = 
+SYSINITDIR = /etc/init.d
+USE_GENGETOPT_FALSE = #
+USE_GENGETOPT_TRUE = 
+USE_LYNX_FALSE = #
+USE_LYNX_TRUE = 
+USE_XMLTOMAN_FALSE = #
+USE_XMLTOMAN_TRUE = 
+VERSION = 0.1
+ac_ct_CC = gcc
+ac_ct_STRIP = 
+am__fastdepCC_FALSE = #
+am__fastdepCC_TRUE = 
+am__include = include
+am__leading_dot = .
+am__quote = 
+bindir = ${exec_prefix}/bin
+build_alias = 
+datadir = ${prefix}/share
+exec_prefix = ${prefix}
+have_gengetopt = yes
+have_lynx = yes
+have_xmltoman = yes
+host_alias = 
+includedir = ${prefix}/include
+infodir = ${prefix}/info
+install_sh = /home/lennart/projects/ivam2/install-sh
+libdir = ${exec_prefix}/lib
+libexecdir = ${exec_prefix}/libexec
+localstatedir = ${prefix}/var
+mandir = ${prefix}/man
+oldincludedir = /usr/include
+pkgpyexecdir = ${pyexecdir}/ivam2
+pkgpythondir = ${pythondir}/ivam2
+prefix = /usr/local/stow/ivam2-0.1
+program_transform_name = s,x,x,
+pyexecdir = ${exec_prefix}/lib/python2.3/site-packages
+pythondir = ${prefix}/lib/python2.3/site-packages
+sbindir = ${exec_prefix}/sbin
+sharedstatedir = ${prefix}/com
+sysconfdir = /etc
+target_alias = 
+
+sbin_PROGRAMS = ivamd
+
+ivamd_SOURCES = buffio.c dle.c exec.c main.c modemman.c timevalarith.c cmdline.c dtmffifo.c lock.c modem.c msntab.c util.c \
+				buffio.h dle.h exec.h main.h modemman.h timevalarith.h cmdline.h dtmffifo.h lock.h modem.h msntab.h util.h
+
+
+ivamd_LDADD = $(LIBOOP_LIBS) $(LIBDAEMON_LIBS)
+ivamd_CFLAGS = $(LIBOOP_CFLAGS) $(LIBDAEMON_CFLAGS) $(AM_CFLAGS) -DPKGSYSCONFDIR="\"${sysconfdir}/ivam2\"" -DLOCKDIR="\"$(LOCKDIR)\"" -DBINDIR="\"$(bindir)\""
+
+EXTRA_DIST = ivamd.ggo
+MAINTAINERCLEANFILES = 
+BUILT_SOURCES = $(am__append_2)
+CLEANFILES = $(am__append_1)
+subdir = src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+sbin_PROGRAMS = ivamd$(EXEEXT)
+PROGRAMS = $(sbin_PROGRAMS)
+
+am_ivamd_OBJECTS = ivamd-buffio.$(OBJEXT) ivamd-dle.$(OBJEXT) \
+	ivamd-exec.$(OBJEXT) ivamd-main.$(OBJEXT) \
+	ivamd-modemman.$(OBJEXT) ivamd-timevalarith.$(OBJEXT) \
+	ivamd-cmdline.$(OBJEXT) ivamd-dtmffifo.$(OBJEXT) \
+	ivamd-lock.$(OBJEXT) ivamd-modem.$(OBJEXT) \
+	ivamd-msntab.$(OBJEXT) ivamd-util.$(OBJEXT)
+ivamd_OBJECTS = $(am_ivamd_OBJECTS)
+ivamd_DEPENDENCIES =
+ivamd_LDFLAGS =
+
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+DEP_FILES = ./$(DEPDIR)/ivamd-buffio.Po \
+	./$(DEPDIR)/ivamd-cmdline.Po \
+	./$(DEPDIR)/ivamd-dle.Po \
+	./$(DEPDIR)/ivamd-dtmffifo.Po \
+	./$(DEPDIR)/ivamd-exec.Po ./$(DEPDIR)/ivamd-lock.Po \
+	./$(DEPDIR)/ivamd-main.Po \
+	./$(DEPDIR)/ivamd-modem.Po \
+	./$(DEPDIR)/ivamd-modemman.Po \
+	./$(DEPDIR)/ivamd-msntab.Po \
+	./$(DEPDIR)/ivamd-timevalarith.Po \
+	./$(DEPDIR)/ivamd-util.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 = $(ivamd_SOURCES)
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
+SOURCES = $(ivamd_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)
+	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)
+install-sbinPROGRAMS: $(sbin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(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; \
+	  else :; fi; \
+	done
+
+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; \
+	done
+
+clean-sbinPROGRAMS:
+	-test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+ivamd$(EXEEXT): $(ivamd_OBJECTS) $(ivamd_DEPENDENCIES) 
+	@rm -f ivamd$(EXEEXT)
+	$(LINK) $(ivamd_LDFLAGS) $(ivamd_OBJECTS) $(ivamd_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+include ./$(DEPDIR)/ivamd-buffio.Po
+include ./$(DEPDIR)/ivamd-cmdline.Po
+include ./$(DEPDIR)/ivamd-dle.Po
+include ./$(DEPDIR)/ivamd-dtmffifo.Po
+include ./$(DEPDIR)/ivamd-exec.Po
+include ./$(DEPDIR)/ivamd-lock.Po
+include ./$(DEPDIR)/ivamd-main.Po
+include ./$(DEPDIR)/ivamd-modem.Po
+include ./$(DEPDIR)/ivamd-modemman.Po
+include ./$(DEPDIR)/ivamd-msntab.Po
+include ./$(DEPDIR)/ivamd-timevalarith.Po
+include ./$(DEPDIR)/ivamd-util.Po
+
+.c.o:
+	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
+	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+	fi
+#	source='$<' object='$@' libtool=no \
+#	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
+	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
+	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
+	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
+	fi
+#	source='$<' object='$@' libtool=no \
+#	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+
+ivamd-buffio.o: buffio.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-buffio.o -MD -MP -MF "$(DEPDIR)/ivamd-buffio.Tpo" \
+	  -c -o ivamd-buffio.o `test -f 'buffio.c' || echo '$(srcdir)/'`buffio.c; \
+	then mv -f "$(DEPDIR)/ivamd-buffio.Tpo" "$(DEPDIR)/ivamd-buffio.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-buffio.Tpo"; exit 1; \
+	fi
+#	source='buffio.c' object='ivamd-buffio.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-buffio.Po' tmpdepfile='$(DEPDIR)/ivamd-buffio.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-buffio.o `test -f 'buffio.c' || echo '$(srcdir)/'`buffio.c
+
+ivamd-buffio.obj: buffio.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-buffio.obj -MD -MP -MF "$(DEPDIR)/ivamd-buffio.Tpo" \
+	  -c -o ivamd-buffio.obj `if test -f 'buffio.c'; then $(CYGPATH_W) 'buffio.c'; else $(CYGPATH_W) '$(srcdir)/buffio.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-buffio.Tpo" "$(DEPDIR)/ivamd-buffio.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-buffio.Tpo"; exit 1; \
+	fi
+#	source='buffio.c' object='ivamd-buffio.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-buffio.Po' tmpdepfile='$(DEPDIR)/ivamd-buffio.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-buffio.obj `if test -f 'buffio.c'; then $(CYGPATH_W) 'buffio.c'; else $(CYGPATH_W) '$(srcdir)/buffio.c'; fi`
+
+ivamd-dle.o: dle.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-dle.o -MD -MP -MF "$(DEPDIR)/ivamd-dle.Tpo" \
+	  -c -o ivamd-dle.o `test -f 'dle.c' || echo '$(srcdir)/'`dle.c; \
+	then mv -f "$(DEPDIR)/ivamd-dle.Tpo" "$(DEPDIR)/ivamd-dle.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-dle.Tpo"; exit 1; \
+	fi
+#	source='dle.c' object='ivamd-dle.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-dle.Po' tmpdepfile='$(DEPDIR)/ivamd-dle.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-dle.o `test -f 'dle.c' || echo '$(srcdir)/'`dle.c
+
+ivamd-dle.obj: dle.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-dle.obj -MD -MP -MF "$(DEPDIR)/ivamd-dle.Tpo" \
+	  -c -o ivamd-dle.obj `if test -f 'dle.c'; then $(CYGPATH_W) 'dle.c'; else $(CYGPATH_W) '$(srcdir)/dle.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-dle.Tpo" "$(DEPDIR)/ivamd-dle.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-dle.Tpo"; exit 1; \
+	fi
+#	source='dle.c' object='ivamd-dle.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-dle.Po' tmpdepfile='$(DEPDIR)/ivamd-dle.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-dle.obj `if test -f 'dle.c'; then $(CYGPATH_W) 'dle.c'; else $(CYGPATH_W) '$(srcdir)/dle.c'; fi`
+
+ivamd-exec.o: exec.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-exec.o -MD -MP -MF "$(DEPDIR)/ivamd-exec.Tpo" \
+	  -c -o ivamd-exec.o `test -f 'exec.c' || echo '$(srcdir)/'`exec.c; \
+	then mv -f "$(DEPDIR)/ivamd-exec.Tpo" "$(DEPDIR)/ivamd-exec.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-exec.Tpo"; exit 1; \
+	fi
+#	source='exec.c' object='ivamd-exec.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-exec.Po' tmpdepfile='$(DEPDIR)/ivamd-exec.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-exec.o `test -f 'exec.c' || echo '$(srcdir)/'`exec.c
+
+ivamd-exec.obj: exec.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-exec.obj -MD -MP -MF "$(DEPDIR)/ivamd-exec.Tpo" \
+	  -c -o ivamd-exec.obj `if test -f 'exec.c'; then $(CYGPATH_W) 'exec.c'; else $(CYGPATH_W) '$(srcdir)/exec.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-exec.Tpo" "$(DEPDIR)/ivamd-exec.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-exec.Tpo"; exit 1; \
+	fi
+#	source='exec.c' object='ivamd-exec.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-exec.Po' tmpdepfile='$(DEPDIR)/ivamd-exec.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-exec.obj `if test -f 'exec.c'; then $(CYGPATH_W) 'exec.c'; else $(CYGPATH_W) '$(srcdir)/exec.c'; fi`
+
+ivamd-main.o: main.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-main.o -MD -MP -MF "$(DEPDIR)/ivamd-main.Tpo" \
+	  -c -o ivamd-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
+	then mv -f "$(DEPDIR)/ivamd-main.Tpo" "$(DEPDIR)/ivamd-main.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-main.Tpo"; exit 1; \
+	fi
+#	source='main.c' object='ivamd-main.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-main.Po' tmpdepfile='$(DEPDIR)/ivamd-main.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+ivamd-main.obj: main.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-main.obj -MD -MP -MF "$(DEPDIR)/ivamd-main.Tpo" \
+	  -c -o ivamd-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-main.Tpo" "$(DEPDIR)/ivamd-main.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-main.Tpo"; exit 1; \
+	fi
+#	source='main.c' object='ivamd-main.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-main.Po' tmpdepfile='$(DEPDIR)/ivamd-main.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi`
+
+ivamd-modemman.o: modemman.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-modemman.o -MD -MP -MF "$(DEPDIR)/ivamd-modemman.Tpo" \
+	  -c -o ivamd-modemman.o `test -f 'modemman.c' || echo '$(srcdir)/'`modemman.c; \
+	then mv -f "$(DEPDIR)/ivamd-modemman.Tpo" "$(DEPDIR)/ivamd-modemman.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-modemman.Tpo"; exit 1; \
+	fi
+#	source='modemman.c' object='ivamd-modemman.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-modemman.Po' tmpdepfile='$(DEPDIR)/ivamd-modemman.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-modemman.o `test -f 'modemman.c' || echo '$(srcdir)/'`modemman.c
+
+ivamd-modemman.obj: modemman.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-modemman.obj -MD -MP -MF "$(DEPDIR)/ivamd-modemman.Tpo" \
+	  -c -o ivamd-modemman.obj `if test -f 'modemman.c'; then $(CYGPATH_W) 'modemman.c'; else $(CYGPATH_W) '$(srcdir)/modemman.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-modemman.Tpo" "$(DEPDIR)/ivamd-modemman.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-modemman.Tpo"; exit 1; \
+	fi
+#	source='modemman.c' object='ivamd-modemman.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-modemman.Po' tmpdepfile='$(DEPDIR)/ivamd-modemman.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-modemman.obj `if test -f 'modemman.c'; then $(CYGPATH_W) 'modemman.c'; else $(CYGPATH_W) '$(srcdir)/modemman.c'; fi`
+
+ivamd-timevalarith.o: timevalarith.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-timevalarith.o -MD -MP -MF "$(DEPDIR)/ivamd-timevalarith.Tpo" \
+	  -c -o ivamd-timevalarith.o `test -f 'timevalarith.c' || echo '$(srcdir)/'`timevalarith.c; \
+	then mv -f "$(DEPDIR)/ivamd-timevalarith.Tpo" "$(DEPDIR)/ivamd-timevalarith.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-timevalarith.Tpo"; exit 1; \
+	fi
+#	source='timevalarith.c' object='ivamd-timevalarith.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-timevalarith.Po' tmpdepfile='$(DEPDIR)/ivamd-timevalarith.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-timevalarith.o `test -f 'timevalarith.c' || echo '$(srcdir)/'`timevalarith.c
+
+ivamd-timevalarith.obj: timevalarith.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-timevalarith.obj -MD -MP -MF "$(DEPDIR)/ivamd-timevalarith.Tpo" \
+	  -c -o ivamd-timevalarith.obj `if test -f 'timevalarith.c'; then $(CYGPATH_W) 'timevalarith.c'; else $(CYGPATH_W) '$(srcdir)/timevalarith.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-timevalarith.Tpo" "$(DEPDIR)/ivamd-timevalarith.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-timevalarith.Tpo"; exit 1; \
+	fi
+#	source='timevalarith.c' object='ivamd-timevalarith.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-timevalarith.Po' tmpdepfile='$(DEPDIR)/ivamd-timevalarith.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-timevalarith.obj `if test -f 'timevalarith.c'; then $(CYGPATH_W) 'timevalarith.c'; else $(CYGPATH_W) '$(srcdir)/timevalarith.c'; fi`
+
+ivamd-cmdline.o: cmdline.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-cmdline.o -MD -MP -MF "$(DEPDIR)/ivamd-cmdline.Tpo" \
+	  -c -o ivamd-cmdline.o `test -f 'cmdline.c' || echo '$(srcdir)/'`cmdline.c; \
+	then mv -f "$(DEPDIR)/ivamd-cmdline.Tpo" "$(DEPDIR)/ivamd-cmdline.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-cmdline.Tpo"; exit 1; \
+	fi
+#	source='cmdline.c' object='ivamd-cmdline.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-cmdline.Po' tmpdepfile='$(DEPDIR)/ivamd-cmdline.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-cmdline.o `test -f 'cmdline.c' || echo '$(srcdir)/'`cmdline.c
+
+ivamd-cmdline.obj: cmdline.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-cmdline.obj -MD -MP -MF "$(DEPDIR)/ivamd-cmdline.Tpo" \
+	  -c -o ivamd-cmdline.obj `if test -f 'cmdline.c'; then $(CYGPATH_W) 'cmdline.c'; else $(CYGPATH_W) '$(srcdir)/cmdline.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-cmdline.Tpo" "$(DEPDIR)/ivamd-cmdline.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-cmdline.Tpo"; exit 1; \
+	fi
+#	source='cmdline.c' object='ivamd-cmdline.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-cmdline.Po' tmpdepfile='$(DEPDIR)/ivamd-cmdline.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-cmdline.obj `if test -f 'cmdline.c'; then $(CYGPATH_W) 'cmdline.c'; else $(CYGPATH_W) '$(srcdir)/cmdline.c'; fi`
+
+ivamd-dtmffifo.o: dtmffifo.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-dtmffifo.o -MD -MP -MF "$(DEPDIR)/ivamd-dtmffifo.Tpo" \
+	  -c -o ivamd-dtmffifo.o `test -f 'dtmffifo.c' || echo '$(srcdir)/'`dtmffifo.c; \
+	then mv -f "$(DEPDIR)/ivamd-dtmffifo.Tpo" "$(DEPDIR)/ivamd-dtmffifo.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-dtmffifo.Tpo"; exit 1; \
+	fi
+#	source='dtmffifo.c' object='ivamd-dtmffifo.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-dtmffifo.Po' tmpdepfile='$(DEPDIR)/ivamd-dtmffifo.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-dtmffifo.o `test -f 'dtmffifo.c' || echo '$(srcdir)/'`dtmffifo.c
+
+ivamd-dtmffifo.obj: dtmffifo.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-dtmffifo.obj -MD -MP -MF "$(DEPDIR)/ivamd-dtmffifo.Tpo" \
+	  -c -o ivamd-dtmffifo.obj `if test -f 'dtmffifo.c'; then $(CYGPATH_W) 'dtmffifo.c'; else $(CYGPATH_W) '$(srcdir)/dtmffifo.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-dtmffifo.Tpo" "$(DEPDIR)/ivamd-dtmffifo.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-dtmffifo.Tpo"; exit 1; \
+	fi
+#	source='dtmffifo.c' object='ivamd-dtmffifo.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-dtmffifo.Po' tmpdepfile='$(DEPDIR)/ivamd-dtmffifo.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-dtmffifo.obj `if test -f 'dtmffifo.c'; then $(CYGPATH_W) 'dtmffifo.c'; else $(CYGPATH_W) '$(srcdir)/dtmffifo.c'; fi`
+
+ivamd-lock.o: lock.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-lock.o -MD -MP -MF "$(DEPDIR)/ivamd-lock.Tpo" \
+	  -c -o ivamd-lock.o `test -f 'lock.c' || echo '$(srcdir)/'`lock.c; \
+	then mv -f "$(DEPDIR)/ivamd-lock.Tpo" "$(DEPDIR)/ivamd-lock.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-lock.Tpo"; exit 1; \
+	fi
+#	source='lock.c' object='ivamd-lock.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-lock.Po' tmpdepfile='$(DEPDIR)/ivamd-lock.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-lock.o `test -f 'lock.c' || echo '$(srcdir)/'`lock.c
+
+ivamd-lock.obj: lock.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-lock.obj -MD -MP -MF "$(DEPDIR)/ivamd-lock.Tpo" \
+	  -c -o ivamd-lock.obj `if test -f 'lock.c'; then $(CYGPATH_W) 'lock.c'; else $(CYGPATH_W) '$(srcdir)/lock.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-lock.Tpo" "$(DEPDIR)/ivamd-lock.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-lock.Tpo"; exit 1; \
+	fi
+#	source='lock.c' object='ivamd-lock.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-lock.Po' tmpdepfile='$(DEPDIR)/ivamd-lock.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-lock.obj `if test -f 'lock.c'; then $(CYGPATH_W) 'lock.c'; else $(CYGPATH_W) '$(srcdir)/lock.c'; fi`
+
+ivamd-modem.o: modem.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-modem.o -MD -MP -MF "$(DEPDIR)/ivamd-modem.Tpo" \
+	  -c -o ivamd-modem.o `test -f 'modem.c' || echo '$(srcdir)/'`modem.c; \
+	then mv -f "$(DEPDIR)/ivamd-modem.Tpo" "$(DEPDIR)/ivamd-modem.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-modem.Tpo"; exit 1; \
+	fi
+#	source='modem.c' object='ivamd-modem.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-modem.Po' tmpdepfile='$(DEPDIR)/ivamd-modem.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-modem.o `test -f 'modem.c' || echo '$(srcdir)/'`modem.c
+
+ivamd-modem.obj: modem.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-modem.obj -MD -MP -MF "$(DEPDIR)/ivamd-modem.Tpo" \
+	  -c -o ivamd-modem.obj `if test -f 'modem.c'; then $(CYGPATH_W) 'modem.c'; else $(CYGPATH_W) '$(srcdir)/modem.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-modem.Tpo" "$(DEPDIR)/ivamd-modem.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-modem.Tpo"; exit 1; \
+	fi
+#	source='modem.c' object='ivamd-modem.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-modem.Po' tmpdepfile='$(DEPDIR)/ivamd-modem.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-modem.obj `if test -f 'modem.c'; then $(CYGPATH_W) 'modem.c'; else $(CYGPATH_W) '$(srcdir)/modem.c'; fi`
+
+ivamd-msntab.o: msntab.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-msntab.o -MD -MP -MF "$(DEPDIR)/ivamd-msntab.Tpo" \
+	  -c -o ivamd-msntab.o `test -f 'msntab.c' || echo '$(srcdir)/'`msntab.c; \
+	then mv -f "$(DEPDIR)/ivamd-msntab.Tpo" "$(DEPDIR)/ivamd-msntab.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-msntab.Tpo"; exit 1; \
+	fi
+#	source='msntab.c' object='ivamd-msntab.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-msntab.Po' tmpdepfile='$(DEPDIR)/ivamd-msntab.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-msntab.o `test -f 'msntab.c' || echo '$(srcdir)/'`msntab.c
+
+ivamd-msntab.obj: msntab.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-msntab.obj -MD -MP -MF "$(DEPDIR)/ivamd-msntab.Tpo" \
+	  -c -o ivamd-msntab.obj `if test -f 'msntab.c'; then $(CYGPATH_W) 'msntab.c'; else $(CYGPATH_W) '$(srcdir)/msntab.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-msntab.Tpo" "$(DEPDIR)/ivamd-msntab.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-msntab.Tpo"; exit 1; \
+	fi
+#	source='msntab.c' object='ivamd-msntab.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-msntab.Po' tmpdepfile='$(DEPDIR)/ivamd-msntab.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-msntab.obj `if test -f 'msntab.c'; then $(CYGPATH_W) 'msntab.c'; else $(CYGPATH_W) '$(srcdir)/msntab.c'; fi`
+
+ivamd-util.o: util.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-util.o -MD -MP -MF "$(DEPDIR)/ivamd-util.Tpo" \
+	  -c -o ivamd-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c; \
+	then mv -f "$(DEPDIR)/ivamd-util.Tpo" "$(DEPDIR)/ivamd-util.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-util.Tpo"; exit 1; \
+	fi
+#	source='util.c' object='ivamd-util.o' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-util.Po' tmpdepfile='$(DEPDIR)/ivamd-util.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c
+
+ivamd-util.obj: util.c
+	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -MT ivamd-util.obj -MD -MP -MF "$(DEPDIR)/ivamd-util.Tpo" \
+	  -c -o ivamd-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`; \
+	then mv -f "$(DEPDIR)/ivamd-util.Tpo" "$(DEPDIR)/ivamd-util.Po"; \
+	else rm -f "$(DEPDIR)/ivamd-util.Tpo"; exit 1; \
+	fi
+#	source='util.c' object='ivamd-util.obj' libtool=no \
+#	depfile='$(DEPDIR)/ivamd-util.Po' tmpdepfile='$(DEPDIR)/ivamd-util.TPo' \
+#	$(CCDEPMODE) $(depcomp) \
+#	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ivamd_CFLAGS) $(CFLAGS) -c -o ivamd-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi`
+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 \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+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'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(sbindir)
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-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)
+clean: clean-am
+
+clean-am: clean-generic clean-sbinPROGRAMS mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-exec-am: install-sbinPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+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 \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am uninstall-sbinPROGRAMS
+
+
+cmdline.c cmdline.h: ivamd.ggo Makefile
+	gengetopt < $<
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..9b5b729
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,40 @@
+# $Id$
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+sbin_PROGRAMS = ivamd
+
+ivamd_SOURCES = buffio.c dle.c exec.c main.c modemman.c timevalarith.c cmdline.c dtmffifo.c lock.c modem.c msntab.c util.c \
+				buffio.h dle.h exec.h main.h modemman.h timevalarith.h cmdline.h dtmffifo.h lock.h modem.h msntab.h util.h
+
+ivamd_LDADD = $(LIBOOP_LIBS) $(LIBDAEMON_LIBS)
+ivamd_CFLAGS = $(LIBOOP_CFLAGS) $(LIBDAEMON_CFLAGS) $(AM_CFLAGS) -DPKGSYSCONFDIR="\"${sysconfdir}/@PACKAGE@\"" -DLOCKDIR="\"$(LOCKDIR)\"" -DBINDIR="\"$(bindir)\""
+
+EXTRA_DIST = ivamd.ggo
+MAINTAINERCLEANFILES =
+BUILT_SOURCES = 
+CLEANFILES = 
+
+if USE_GENGETOPT 
+
+CLEANFILES += cmdline.c cmdline.h
+BUILT_SOURCES += cmdline.c cmdline.h
+
+cmdline.c cmdline.h: ivamd.ggo Makefile
+	gengetopt < $<
+
+endif
diff --git a/src/buffio.c b/src/buffio.c
index 4771b1c..d8cafaa 100644
--- a/src/buffio.c
+++ b/src/buffio.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/buffio.h b/src/buffio.h
index fff2514..10f0924 100644
--- a/src/buffio.h
+++ b/src/buffio.h
@@ -1,6 +1,26 @@
 #ifndef foobuffiohfoo
 #define foobuffiohfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include <inttypes.h>
 #include <sys/types.h>
 
diff --git a/src/dle.c b/src/dle.c
index 1cf9fa7..3e291e4 100644
--- a/src/dle.c
+++ b/src/dle.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 
 #include "dle.h"
diff --git a/src/dle.h b/src/dle.h
index 31d511b..5f2ca19 100644
--- a/src/dle.h
+++ b/src/dle.h
@@ -1,6 +1,26 @@
 #ifndef foodlehfoo
 #define foodlehfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include <sys/types.h>
 #include <inttypes.h>
 
diff --git a/src/dtmffifo.c b/src/dtmffifo.c
index f959158..c584232 100644
--- a/src/dtmffifo.c
+++ b/src/dtmffifo.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <libdaemon/dlog.h>
 #include <limits.h>
@@ -14,6 +38,7 @@
 struct dtmf_fifo* dtmf_fifo_new(void) {
     struct dtmf_fifo *d = NULL;
     char p[PATH_MAX];
+    mode_t u;
 
     d = malloc(sizeof(struct dtmf_fifo));
     assert(d);
@@ -23,7 +48,9 @@ struct dtmf_fifo* dtmf_fifo_new(void) {
     d->dir = strdup("/tmp/ivamd.XXXXXX");
     assert(d->dir);
 
+    u = umask(0077);
     if (!mkdtemp(d->dir)) {
+        umask(u);
         daemon_log(LOG_ERR, "Failed to create temporary directory '%s': %s", d->dir, strerror(errno));
         goto fail;
     }
@@ -33,9 +60,12 @@ struct dtmf_fifo* dtmf_fifo_new(void) {
     assert(d->fname);
 
     if (mkfifo(d->fname, 0700) != 0) {
+        umask(u);
         daemon_log(LOG_ERR, "Failed to create FIFO '%s': %s", d->fname, strerror(errno));
         goto fail;
     }
+
+    umask(u);
     
     if ((d->fd = open(d->fname, O_RDWR|O_NDELAY)) < 0) {
         daemon_log(LOG_ERR, "Failed to open FIFO '%s': %s", d->fname, strerror(errno));
diff --git a/src/dtmffifo.h b/src/dtmffifo.h
index 39e39c9..421b96d 100644
--- a/src/dtmffifo.h
+++ b/src/dtmffifo.h
@@ -1,6 +1,26 @@
 #ifndef foodtmffifohfoo
 #define foodtmffifohfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 struct dtmf_fifo {
     int fd;
     char *dir, *fname;
diff --git a/src/exec.c b/src/exec.c
index 5691c75..a674725 100644
--- a/src/exec.c
+++ b/src/exec.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -317,6 +341,8 @@ pid_t child_process_create(const char *file, char *const argv[], int *ifd, int *
             close(stderr_fds[1]);
         }
 
+        umask(0077);
+        
         execvp(file, argv);
         daemon_log(LOG_ERR, "exec('%s', ...) failed: %s", file, strerror(errno));
         exit(1);
diff --git a/src/exec.h b/src/exec.h
index 2c929da..6b10988 100644
--- a/src/exec.h
+++ b/src/exec.h
@@ -1,6 +1,26 @@
 #ifndef fooexechfoo
 #define fooexechfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include <sys/types.h>
 
 typedef void (*process_exit_cb_t) (pid_t pid, int status, void *user);
diff --git a/src/ivamd.ggo b/src/ivamd.ggo
index ca280a4..b975c51 100644
--- a/src/ivamd.ggo
+++ b/src/ivamd.ggo
@@ -17,14 +17,14 @@
 #  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 purpose "ISDN Voice Box Answering Machine"
-package "ivam"
-version "0.1"
 
 option "kill" k "Kill a running daemon" flag off
 option "no-daemon" n "Do not daemonize" flag off
 option "no-syslog" s "Do not log to syslog" flag off
 option "check" c "Check if the daemon is currently running" flag off
 option "channels" C "Specify how many channels to allocate, defaults to 2" int default="2" no
-option "msntab" T "Specify non standard msntab file" string no
-option "listen" L "Specify a glob pattern matchin the MSNs to listen on" string no
+option "msntab" - "Specify non standard msntab file" string no
+option "listen" L "Specify a glob pattern matching the MSNs to listen on" string no
 option "no-drop-root" - "Do not drop root priviliges" flag off
+option "reload" - "Tell a running instance to reload the MSN table" flag off
+option "info" - "Tell a running ivamd to dump its MSN table to syslog" flag off
diff --git a/src/lock.c b/src/lock.c
index efce0bb..f629ee0 100644
--- a/src/lock.c
+++ b/src/lock.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdio.h>
@@ -16,12 +40,9 @@
 #include "util.h"
 #include "main.h"
 
-/* Where do lockfiles reside? */
-#define LOCK_PATH "/var/lock"
-
 static const char *lockfile(const char *dev) {
     static char lockfile[PATH_MAX];
-    snprintf(lockfile, sizeof(lockfile), "%s/LCK..%s", LOCK_PATH, basename((char*) dev));
+    snprintf(lockfile, sizeof(lockfile), "%s/LCK..%s", LOCKDIR, basename((char*) dev));
     return lockfile;
 }
 
@@ -38,8 +59,8 @@ int device_lock(const char *dev) {
     char buf[100];
     char uidbuf[32];
 
-    if (stat(LOCK_PATH, &st) != 0 || !S_ISDIR(st.st_mode)) {
-        daemon_log(LOG_ERR, "Failed to lock device, directory "LOCK_PATH" not existent.");
+    if (stat(LOCKDIR, &st) != 0 || !S_ISDIR(st.st_mode)) {
+        daemon_log(LOG_ERR, "Failed to lock device, directory "LOCKDIR" not existent.");
         return -1;
     }
 
diff --git a/src/lock.h b/src/lock.h
index cd201a0..0401e13 100644
--- a/src/lock.h
+++ b/src/lock.h
@@ -1,6 +1,26 @@
 #ifndef foolockhfoo
 #define foolockhfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 int device_lock(const char *dev);
 int device_unlock(const char *dev);
 
diff --git a/src/main.c b/src/main.c
index 53f8e80..bc96fb5 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <signal.h>
 #include <assert.h>
 #include <string.h>
@@ -5,6 +29,7 @@
 #include <grp.h>
 #include <pwd.h>
 #include <sys/types.h>
+#include <stdlib.h>
 
 #include <libdaemon/dlog.h>
 #include <libdaemon/dfork.h>
@@ -23,7 +48,7 @@ const char *appname = NULL;
 uid_t target_uid = 0;
 gid_t target_gid = 0;
 
-#define DEFAULT_MSNTABLE "../conf/msntab"
+#define DEFAULT_MSNTABLE PKGSYSCONFDIR"/msntab"
 #define IVAM_USER "ivam"
 #define IVAM_GROUP "ivam"
 
@@ -51,6 +76,8 @@ static void *oop_dump_cb(oop_source *source, int sig, void *user) {
 
 
 static int change_uid_gid(void) {
+    struct passwd *pw;
+    
     if (args.no_drop_root_flag)
         return 0;
         
@@ -69,6 +96,16 @@ static int change_uid_gid(void) {
         return -1;
     }
 
+    if ((pw = getpwuid(target_uid))) {
+        setenv("USER", pw->pw_name, 1);
+        setenv("LOGNAME", pw->pw_name, 1);
+        setenv("HOME", pw->pw_dir, 1);
+    } else {
+        unsetenv("USER");
+        unsetenv("LOGNAME");
+        unsetenv("HOME");
+    }
+    
     daemon_log(LOG_INFO, "Successfully dropped root privileges.");
     
     return 0;
@@ -110,6 +147,8 @@ int main_loop(void) {
 
     if (get_target_uid_gid() < 0)
         goto finish;
+
+    setenv("PATH", BINDIR":/usr/sbin:/usr/bin:/sbin:/bin/:/usr/local/sbin:/usr/local/bin", 1);
     
     if (!(sys = oop_sys_new())) {
         daemon_log(LOG_ERR, "Failed to create system source.");
@@ -193,11 +232,20 @@ int main(int argc, char*argv[]) {
         int ret;
         
         if ((ret = daemon_pid_file_kill_wait(SIGINT, 5)) < 0)
-            daemon_log(LOG_WARNING, "Failed to kill daemon.");
+            daemon_log(LOG_WARNING, "Failed to kill daemon: %s", strerror(errno));
 
         return ret  < 0 ? 1 : 0;
     }
 
+    if (args.reload_flag || args.info_flag) {
+        int ret;
+        
+        if ((ret = daemon_pid_file_kill(args.reload_flag ? SIGHUP : SIGUSR1)) < 0)
+            daemon_log(LOG_WARNING, "Failed to kill daemon: %s", strerror(errno));
+
+        return ret < 0 ? 1 : 0;
+    }
+
     if (args.check_flag) {
         if ((pid = daemon_pid_file_is_running()) >= 0)
             daemon_log(LOG_INFO, "Daemon running on PID %u.", pid);
diff --git a/src/main.h b/src/main.h
index 6ceb7f2..64718b1 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,26 @@
 #ifndef foomainhfoo
 #define foomainhfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include <oop.h>
 
 #include "cmdline.h"
diff --git a/src/modem.c b/src/modem.c
index 3035969..260e07f 100644
--- a/src/modem.c
+++ b/src/modem.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stddef.h>
 #include <termios.h>
 #include <assert.h>
diff --git a/src/modem.h b/src/modem.h
index 08e20b8..5b216ca 100644
--- a/src/modem.h
+++ b/src/modem.h
@@ -1,6 +1,26 @@
 #ifndef foomodemhfoo
 #define foomodemhfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include "buffio.h"
 #include "msntab.h"
 
diff --git a/src/modemman.c b/src/modemman.c
index ba3c3e2..ab0dd6e 100644
--- a/src/modemman.c
+++ b/src/modemman.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stddef.h>
 #include <assert.h>
 #include <limits.h>
diff --git a/src/modemman.h b/src/modemman.h
index 9e108b3..5f85fed 100644
--- a/src/modemman.h
+++ b/src/modemman.h
@@ -1,6 +1,26 @@
 #ifndef foomodemmanhfoo
 #define foomodemmanhfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include "modem.h"
 
 int modem_manager_init(int channels);
diff --git a/src/msntab.c b/src/msntab.c
index cf84ec8..6bdd17c 100644
--- a/src/msntab.c
+++ b/src/msntab.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stddef.h>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/msntab.h b/src/msntab.h
index dc1bf1c..2a09f2a 100644
--- a/src/msntab.h
+++ b/src/msntab.h
@@ -1,6 +1,26 @@
 #ifndef foomsntabhfoo
 #define foomsntabhfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 enum call_action { CALL_ACTION_IGNORE, CALL_ACTION_ACCEPT, CALL_ACTION_HANGUP };
 
 struct tabentry {
diff --git a/src/timevalarith.c b/src/timevalarith.c
index 1091192..626ae75 100644
--- a/src/timevalarith.c
+++ b/src/timevalarith.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "timevalarith.h"
 
 struct timeval timeval_max(struct timeval a, struct timeval b) {
diff --git a/src/timevalarith.h b/src/timevalarith.h
index c0c015b..8ff0ada 100644
--- a/src/timevalarith.h
+++ b/src/timevalarith.h
@@ -1,6 +1,26 @@
 #ifndef footimevalarithhfoo
 #define footimevalarithhfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include <sys/types.h>
 #include <inttypes.h>
 
diff --git a/src/util.c b/src/util.c
index 3ba6506..64ae827 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,3 +1,27 @@
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string.h>
 #include <unistd.h>
 
diff --git a/src/util.h b/src/util.h
index 262d26c..2249c6d 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,26 @@
 #ifndef fooutilhfoo
 #define fooutilhfoo
 
+/* $Id$ */
+
+/***
+  This file is part of ivam2.
+
+  ivam2 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.
+  
+  ivam2 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 ivam2; if not, write to the Free Software Foundation,
+  Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+***/
+
 #include <sys/types.h>
 
 char *basename(char *path);
diff --git a/ulaw/Makefile.am b/ulaw/Makefile.am
new file mode 100644
index 0000000..617cfb1
--- /dev/null
+++ b/ulaw/Makefile.am
@@ -0,0 +1,20 @@
+# $Id: Makefile.am 17 2003-12-04 21:53:17Z lennart $
+#
+# This file is part of ivam2.
+#
+# ivam2 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.
+#
+# ivam2 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 ivam2; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+
+ulawdir = $(pkgdatadir)/ulaw
+ulaw_DATA = authok.ulaw.gz auth.ulaw.gz beep.ulaw.gz empty.ulaw.gz nomoremessages.ulaw.gz removed.ulaw.gz welcome.ulaw.gz