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
fan98 · May 7, 2007 · b65aa2a · b65aa2a
1 parent 275f8c4
commit b65aa2a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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>