summaryrefslogtreecommitdiffstats
path: root/patches/libmemcache-1.4.0.rc2/0001-use-cached-for-setsockopt-in-configure.ac.patch
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-02-08 17:23:48 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-04-08 11:00:10 +0200
commite291ef51e9a325ffef8acf1ad98e7d344504778f (patch)
tree685bafcac9e029130da079288e825af726346e99 /patches/libmemcache-1.4.0.rc2/0001-use-cached-for-setsockopt-in-configure.ac.patch
parentf0787ee5e8990840761f55c125fa60847d7b355b (diff)
downloadptxdist-e291ef51e9a325ffef8acf1ad98e7d344504778f.tar.gz
ptxdist-e291ef51e9a325ffef8acf1ad98e7d344504778f.tar.xz
libmemcache: remove patch that updates configure etc.
autogen.sh generates these files, so this patch is not needed Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/libmemcache-1.4.0.rc2/0001-use-cached-for-setsockopt-in-configure.ac.patch')
-rw-r--r--patches/libmemcache-1.4.0.rc2/0001-use-cached-for-setsockopt-in-configure.ac.patch80
1 files changed, 80 insertions, 0 deletions
diff --git a/patches/libmemcache-1.4.0.rc2/0001-use-cached-for-setsockopt-in-configure.ac.patch b/patches/libmemcache-1.4.0.rc2/0001-use-cached-for-setsockopt-in-configure.ac.patch
new file mode 100644
index 000000000..aca28c5af
--- /dev/null
+++ b/patches/libmemcache-1.4.0.rc2/0001-use-cached-for-setsockopt-in-configure.ac.patch
@@ -0,0 +1,80 @@
+From: George McCollister <george.mccollister@gmail.com>
+Date: Wed, 17 Nov 2010 16:20:57 -0600
+Subject: [PATCH] use cached for setsockopt in configure.ac
+
+Use AC_CACHE_CHECK so we can pass in cached values in for setsockopt
+checks.
+
+Signed-off-by: George McCollister <george.mccollister@gmail.com>
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ configure.ac | 46 +++++++++++++++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a1c8bf1..827e124 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -224,37 +224,41 @@ fi
+ dnl END debug CFLAGS
+
+ AC_DEFUN([MCM_CHECK_SETSOCKOPT], [
+-AC_MSG_CHECKING(whether to use $1 with setsockopt())
+-AC_TRY_RUN([
++ AC_CACHE_CHECK(whether to use $1 with setsockopt(), ac_cv_setsockopt_$1, [
++ AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+
+-int
+-main(void) {
+- int s;
+- struct timeval tv;
+- tv.tv_sec = 3;
+- tv.tv_usec = 0;
++ int
++ main(void) {
++ int s;
++ struct timeval tv;
++ tv.tv_sec = 3;
++ tv.tv_usec = 0;
+
+ #ifndef $1
+- exit(3);
++ exit(3);
+ #else
+- if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1)
+- exit(2);
++ if ((s = socket(AF_INET, SOCK_STREAM, 0)) == -1)
++ exit(2);
+
+- /* fails on Solaris 2.6,8,9,10 and some Linuxes because
+- SO_RCVTIMEO|SO_SNDTIMEO are defined but not implemented */
+- if (setsockopt(s, SOL_SOCKET, $1, (const void *)&tv, sizeof(tv)) == -1)
+- exit(1);
++ /* fails on Solaris 2.6,8,9,10 and some Linuxes because
++ SO_RCVTIMEO|SO_SNDTIMEO are defined but not implemented */
++ if (setsockopt(s, SOL_SOCKET, $1, (const void *)&tv, sizeof(tv)) == -1)
++ exit(1);
+
+- exit(0);
++ exit(0);
+ #endif
+-}
+-]
+-, [ AC_MSG_RESULT([yes]) AC_DEFINE(USE_$1, 1, [Define to use $1 with setsockopt()]) ]
+-, [ AC_MSG_RESULT([no]) ]
+-)
++ }
++ ], ac_cv_setsockopt_$1=yes, ac_cv_setsockopt_$1=no)
++ ])
++ if test $ac_cv_setsockopt_$1 = yes; then
++ result=1
++ else
++ result=0
++ fi
++ AC_DEFINE_UNQUOTED(USE_$1, [$result], [Define to use $1 with setsockopt()])
+ ])
+
+ dnl check for SO_RCVTIMEO and SO_SNDTIMEO