diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-12 18:03:33 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-12 18:03:33 +0200 |
| commit | ac8ca680f7e68d9a2e9c5f8ba32b15b84557e772 (patch) | |
| tree | 0e3b88d3e635a57dc16ff89401ace61ffffb33df /m4 | |
| parent | 789f34cd49bf40c2c14fbcbaa9ac09b72994006b (diff) | |
| parent | 753fbd6127fd4457e777b61799003b9ebbc4b558 (diff) | |
| download | xine-lib-ac8ca680f7e68d9a2e9c5f8ba32b15b84557e772.tar.gz xine-lib-ac8ca680f7e68d9a2e9c5f8ba32b15b84557e772.tar.bz2 | |
Update from 1.1 branch.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/pthreads.m4 | 2 | ||||
| -rw-r--r-- | m4/xv.m4 | 5 |
2 files changed, 1 insertions, 6 deletions
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);]] @@ -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 |