summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Lindner <plindner@hi5.com>2007-05-07 19:50:54 +0000
committerPaul Lindner <plindner@hi5.com>2007-05-07 19:50:54 +0000
commitb65aa2ab5d2748fd9d518b86385aa1e037f07021 (patch)
treeeb6115779ee4c895ae0a4a2dc1f718b82b4cb1e2
parent275f8c40705526ac4514d5dcff2cbf0311b540ac (diff)
downloadmemcached-b65aa2ab5d2748fd9d518b86385aa1e037f07021.tar.gz
fix for freebsd 6.x (and perhaps others)
git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@550 b0b603af-a30f-0410-a34e-baf09ae79d0b
-rw-r--r--ChangeLog4
-rwxr-xr-xautogen.sh4
-rw-r--r--memcached.h1
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8727197..60e9cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-07 Paul Lindner <lindner@inuus.com>
+
+ * Fix compilation bug on freebsd 6.x (and maybe others)
+
2007-05-04 Paul Lindner <lindner@inuus.com>
* Add fedora/redhat style init script and RPM spec file
diff --git a/autogen.sh b/autogen.sh
index 6549536..46cbeba 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,8 +8,8 @@
#
echo "aclocal..."
-ACLOCAL=${ACLOCAL:-aclocal-1.7}
-$ACLOCAL || aclocal-1.5 || aclocal || exit 1
+ACLOCAL=`which aclocal-1.9 || which aclocal19 || which aclocal-1.7 || which aclocal17 || which aclocal-1.5 || which aclocal15 || which aclocal || exit 1`
+$ACLOCAL || exit 1
echo "autoheader..."
AUTOHEADER=${AUTOHEADER:-autoheader}
diff --git a/memcached.h b/memcached.h
index 6690d53..ab0429c 100644
--- a/memcached.h
+++ b/memcached.h
@@ -3,6 +3,7 @@
#include "config.h"
#include <sys/types.h>
+#include <sys/socket.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <event.h>