From 3120d2fecb926fedc4db4d44ff7df025b14355d4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 10 Jan 2004 22:41:31 +0000 Subject: many fixes git-svn-id: file:///home/lennart/svn/public/ivcall/trunk@13 e0b13411-74c3-0310-b366-a0654dd0340f --- Makefile.am | 5 ++ bootstrap.sh | 21 ++++--- configure.ac | 26 +++++---- doc/README.html.in | 19 +++++-- doc/style.css | 25 ++++++++- man/Makefile.am | 15 +++-- man/ivcall.1.xml.in | 5 +- man/xmltoman.css | 30 ++++++++++ man/xmltoman.dtd | 39 +++++++++++++ man/xmltoman.xsl | 120 ++++++++++++++++++++++++++++++++++++++++ src/ivcall.c | 11 ++-- src/lock.c | 154 ++++++++++++++++++++++++++++++++++++---------------- src/lock.h | 4 +- src/util.c | 4 ++ 14 files changed, 391 insertions(+), 87 deletions(-) create mode 100644 man/xmltoman.css create mode 100644 man/xmltoman.dtd create mode 100644 man/xmltoman.xsl diff --git a/Makefile.am b/Makefile.am index 1f2fd20..a107b0a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,3 +33,8 @@ homepage: cp *.tar.gz $$HOME/homepage/lennart/projects/ivcall cp doc/README.html doc/style.css $$HOME/homepage/lennart/projects/ivcall cp $$HOME/homepage/lennart/projects/ivcall/README.html $$HOME/homepage/lennart/projects/ivcall/index.html + +distcleancheck: + @: + +.PHONY: homepage distcleancheck diff --git a/bootstrap.sh b/bootstrap.sh index 73e6c40..6d6db78 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -17,22 +17,29 @@ # along with ivcall; 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 - automake -a -c + run_versioned automake 1.7 -a -c ./config.status else set -ex - - make maintainer-clean || true - rm -rf autom4te.cache rm -f config.cache - aclocal + run_versioned aclocal 1.7 autoheader - automake -a -c + run_versioned automake 1.7 -a -c autoconf -Wall - ./configure "$@" + ./configure --sysconfdir=/etc "$@" + + make clean fi diff --git a/configure.ac b/configure.ac index 2a3b0f5..9c46925 100644 --- a/configure.ac +++ b/configure.ac @@ -19,15 +19,25 @@ # along with ivcall; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -AC_PREREQ(2.57) -AC_INIT([ivcall], [0.2], [mzvipnyy@itaparica.org]) +AC_PREREQ(2.58) +AC_INIT([ivcall], [0.3], [mzvipnyy (at) 0pointer (dot) de]) AC_CONFIG_SRCDIR([src/ivcall.c]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([foreign -Wall]) -AM_MAINTAINER_MODE + +AC_SUBST(PACKAGE_URL, [http://0pointer.de/lennart/projects/ivcall/]) + +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}" +fi # Checks for programs. AC_PROG_CC +AC_PROG_CPP +AC_PROG_INSTALL +AC_PROG_LN_S +AC_PROG_MAKE_SET # If using GCC specify some additional parameters if test "x$GCC" = "xyes" ; then @@ -36,16 +46,12 @@ fi # Specify the locking directory AC_ARG_WITH(lockdir, - AC_HELP_STRING([--with-lockdir=LOCKDIR], [Specify a lock dir]), + AC_HELP_STRING([--with-lockdir=LOCKDIR], [Specify a UUCP lock dir]), LOCK_DIR="${withval}", LOCK_DIR="/var/lock") AC_SUBST(LOCK_DIR) +AC_MSG_NOTICE([*** Using $LOCK_DIR as lock directory ***]) -AC_PROG_CPP -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - AC_CHECK_FUNCS([alarm memset select strdup strerror strrchr]) AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/ioctl.h sys/time.h termios.h unistd.h]) @@ -100,7 +106,5 @@ fi AM_CONDITIONAL([USE_XMLTOMAN], [test "x$xmltoman" = xyes]) -AC_MSG_NOTICE([*** Using $LOCK_DIR as lock directory ***]) - AC_CONFIG_FILES([src/Makefile Makefile man/Makefile doc/Makefile doc/README.html]) AC_OUTPUT diff --git a/doc/README.html.in b/doc/README.html.in index bf7a739..8dd94d4 100644 --- a/doc/README.html.in +++ b/doc/README.html.in @@ -10,7 +10,7 @@

ivcall @PACKAGE_VERSION@

-

Copyright 2002,2003 Lennart Poettering <mzvscyhtq [at] itaparica.org>

+

Copyright 2002,2003 Lennart Poettering <@PACKAGE_BUGREPORT@>