diff options
| author | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-23 16:53:04 +0000 |
|---|---|---|
| committer | Sebastien Estienne <sebastien.estienne@gmail.com> | 2005-10-23 16:53:04 +0000 |
| commit | 12ca6bf367c9903d97b9cac6297e3df422c3cd44 (patch) | |
| tree | e8af63feef98c8c606b7b8e916f7b5d506dc4acd | |
| parent | a6a50fcf1a7160fe0d7394f00c04b8f21693595f (diff) | |
* add a workaround for aclocal bogus on freebsd (common dir)
* #define ETIME ETIMEDOUT for freebsd
git-svn-id: file:///home/lennart/svn/public/libdaemon/trunk@93 153bfa13-eec0-0310-be40-b0cb6a0e1b4b
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rwxr-xr-x | bootstrap.sh | 4 | ||||
| -rw-r--r-- | libdaemon/dpid.c | 4 |
3 files changed, 7 insertions, 5 deletions
@@ -50,8 +50,8 @@ else test "x$LIBTOOLIZE" = "x" && LIBTOOLIZE=libtoolize - "$LIBTOOLIZE" -c --force - run_versioned aclocal "$VERSION" + run_versioned "$LIBTOOLIZE" 1.5 -c --force + run_versioned aclocal "$VERSION" -I common run_versioned autoconf 2.59 -Wall run_versioned autoheader 2.59 run_versioned automake "$VERSION" -a -c --foreign diff --git a/bootstrap.sh b/bootstrap.sh index 8077106..778c00c 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -25,9 +25,7 @@ case `uname -s` in FLAGS="$FLAGS --prefix=/opt/local" ;; FreeBSD) - cp /usr/local/share/aclocal/libtool15.m4 common - export LIBTOOLIZE=/usr/local/bin/libtoolize15 - export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" + cp /usr/local/share/aclocal/libtool15.m4 common/ ;; esac diff --git a/libdaemon/dpid.c b/libdaemon/dpid.c index 678826c..c01ed0a 100644 --- a/libdaemon/dpid.c +++ b/libdaemon/dpid.c @@ -38,6 +38,10 @@ #include "dpid.h" #include "dlog.h" +#ifndef ETIME +#define ETIME ETIMEDOUT /* For FreeBSD */ +#endif + #define VARRUN "/var/run" const char *daemon_pid_file_ident = NULL; |