diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/attributes.m4 | 2 | ||||
| -rw-r--r-- | m4/pthreads.m4 | 10 | ||||
| -rw-r--r-- | m4/xv.m4 | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/m4/attributes.m4 b/m4/attributes.m4 index eaa788c5f..55f34c9f7 100644 --- a/m4/attributes.m4 +++ b/m4/attributes.m4 @@ -119,7 +119,7 @@ AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ AC_CACHE_CHECK([if compiler supports __attribute__((format_arg(printf)))], [cc_cv_attribute_format_arg], [AC_COMPILE_IFELSE([ - void __attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; } + char *__attribute__((format_arg(1))) gettextlike(const char *fmt) { fmt = (void *)0; } ], [cc_cv_attribute_format_arg=yes], [cc_cv_attribute_format_arg=no]) diff --git a/m4/pthreads.m4 b/m4/pthreads.m4 index 28d72dd4f..363a8b4b2 100644 --- a/m4/pthreads.m4 +++ b/m4/pthreads.m4 @@ -36,11 +36,15 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ [ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS" + LIBS="$LIBS $PTHREAD_LIBS" - AC_COMPILE_IFELSE( + AC_LINK_IFELSE( [AC_LANG_PROGRAM( - [[#include <pthread.h>]], - [[pthread_create(NULL, NULL, NULL, NULL);]] + [[#include <pthread.h> + void *fakethread(void *arg) { return NULL; } + pthread_t fakevariable; + ]], + [[pthread_create(&fakevariable, NULL, &fakethread, NULL);]] )], [cc_cv_pthreads=yes], [cc_cv_pthreads=no]) @@ -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 |