summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xautogen.sh4
-rwxr-xr-xbootstrap.sh4
-rw-r--r--libdaemon/dpid.c4
3 files changed, 7 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh
index c1412c8..52c565a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -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;