tigervnc/xorg-bug38185.patch
2012-03-07 09:44:34 +00:00

55 lines
1.4 KiB
Diff

diff -aur o/configure.ac n/configure.ac
--- o/configure.ac 2011-06-17 10:20:19.257000012 +0200
+++ n/configure.ac 2011-06-17 10:05:40.696000013 +0200
@@ -322,7 +322,7 @@
old_CFLAGS="$CFLAGS"
CFLAGS="-mapcs-frame"
AC_COMPILE_IFELSE(
- AC_LANG_PROGRAM([[ ]]),
+ [AC_LANG_SOURCE([[ ]])],
ARM_BACKTRACE_CFLAGS="$CFLAGS",
ARM_BACKTRACE_CFLAGS=""
)
@@ -749,7 +749,7 @@
AC_CACHE_CHECK([whether to build Xquartz],xorg_cv_Carbon_framework,[
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -framework Carbon"
- AC_LINK_IFELSE([char FSFindFolder(); int main() { FSFindFolder(); return 0;}],
+ AC_LINK_IFELSE([AC_LANG_SOURCE([[char FSFindFolder(); int main() { FSFindFolder(); return 0;}]])],
[xorg_cv_Carbon_framework=yes],
[xorg_cv_Carbon_framework=no])
LDFLAGS=$save_LDFLAGS])
@@ -899,10 +899,12 @@
AC_MSG_CHECKING([for glibc...])
AC_PREPROC_IFELSE([
+AC_LANG_SOURCE([[
#include <features.h>
#ifndef __GLIBC__
#error
#endif
+]])
], glibc=yes, glibc=no)
AC_MSG_RESULT([$glibc])
@@ -928,9 +930,10 @@
fi
AC_RUN_IFELSE([
+AC_LANG_SOURCE([[
#include <time.h>
-int main(int argc, char *argv[[]]) {
+int main(int argc, char *argv[]) {
struct timespec tp;
if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
@@ -938,6 +941,7 @@
else
return 1;
}
+]])
], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no],
[MONOTONIC_CLOCK="cross compiling"])