From 275aeba0f94a30c19e4d5f8301cb7c19f7e78386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 11 Apr 2007 18:46:22 +0200
Subject: Return NULL to avoid 'control reaches end of non-void function'
 warning from throwing off the test.

---
 m4/pthreads.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'm4')

diff --git a/m4/pthreads.m4 b/m4/pthreads.m4
index 35193370d..363a8b4b2 100644
--- a/m4/pthreads.m4
+++ b/m4/pthreads.m4
@@ -41,7 +41,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
      AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <pthread.h>
-	    void *fakethread(void *arg) { }
+	    void *fakethread(void *arg) { return NULL; }
 	    pthread_t fakevariable;
 	  ]],
           [[pthread_create(&fakevariable, NULL, &fakethread, NULL);]]
-- 
cgit v1.2.3


From 753fbd6127fd4457e777b61799003b9ebbc4b558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 12 Apr 2007 18:02:38 +0200
Subject: Set xv_path before rewriting X_LIBS if we're not using pkg-config to
 discover X libraries.

---
 m4/xv.m4 | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'm4')

diff --git a/m4/xv.m4 b/m4/xv.m4
index 6d58cd0e7..91380a1de 100644
--- a/m4/xv.m4
+++ b/m4/xv.m4
@@ -68,11 +68,6 @@ AC_DEFUN([AC_FIND_LIBXV],
   # Ensure that AC_PATH_XTRA is executed before this
   AC_REQUIRE([AC_PATH_XTRA])
 
-  # Set xv_path if its not done already
-  if test x$xv_path = x; then
-    xv_path=`echo $X_LIBS | sed -e 's/\-L\(.*\)/\1/'`
-  fi
-
   if test x$xv_path = x; then
     xv_path=/usr/X11R6/lib
   fi
-- 
cgit v1.2.3