Author: benny
Date: 2006-07-30 16:30:46 +0000 (Sun, 30 Jul 2006)
New Revision: 22570
Modified:
thunar/trunk/ChangeLog
thunar/trunk/acinclude.m4
thunar/trunk/configure.in.in
Log:
2006-07-30 Benedikt Meurer <[EMAIL PROTECTED]>
* acinclude.m4(BM_THUNAR_PLUGIN_TPA): Display "no" if the tpa plugin
should not be build.
* configure.in.in: Finally fix the glibc detection.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2006-07-30 15:45:55 UTC (rev 22569)
+++ thunar/trunk/ChangeLog 2006-07-30 16:30:46 UTC (rev 22570)
@@ -1,3 +1,9 @@
+2006-07-30 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * acinclude.m4(BM_THUNAR_PLUGIN_TPA): Display "no" if the tpa plugin
+ should not be build.
+ * configure.in.in: Finally fix the glibc detection.
+
2006-07-29 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar/thunar-application.c(thunar_application_collect_and_launch):
Modified: thunar/trunk/acinclude.m4
===================================================================
--- thunar/trunk/acinclude.m4 2006-07-30 15:45:55 UTC (rev 22569)
+++ thunar/trunk/acinclude.m4 2006-07-30 16:30:46 UTC (rev 22570)
@@ -66,6 +66,8 @@
dnl # Cannot build thunar-tpa if xfce4-panel is not installed
ac_bm_thunar_plugin_tpa=no
])
+else
+ ac_bm_thunar_plugin_tpa=no
fi
AC_MSG_CHECKING([whether to build the thunar-tpa plugin])
AM_CONDITIONAL([THUNAR_PLUGIN_TPA], [test x"$ac_bm_thunar_plugin_tpa" =
x"yes"])
Modified: thunar/trunk/configure.in.in
===================================================================
--- thunar/trunk/configure.in.in 2006-07-30 15:45:55 UTC (rev 22569)
+++ thunar/trunk/configure.in.in 2006-07-30 16:30:46 UTC (rev 22570)
@@ -121,39 +121,18 @@
dnl ******************************************
dnl *** Linux/glibc specified work-arounds ***
dnl ******************************************
-m4_define([glibc_workaround_test],
-[
-posix_madvise (0, 0, POSIX_MADV_NORMAL);
-posix_madvise (0, 0, POSIX_MADV_SEQUENTIAL);
-posix_madvise (0, 0, POSIX_MADV_RANDOM);
-posix_madvise (0, 0, POSIX_MADV_WILLNEED);
-posix_madvise (0, 0, POSIX_MADV_DONTNEED);
-strptime (0, 0, 0);
-dirfd (0);
-])
AC_MSG_CHECKING([whether we need _BSD_SOURCE and _XOPEN_SOURCE])
-AC_TRY_LINK([#include <sys/types.h>
-#include <sys/mman.h>
-#include <dirent.h>
-#include <time.h>], glibc_workaround_test(),
+AC_TRY_LINK([#include <features.h>],
[
- AC_MSG_RESULT([no])
+ if (__GLIBC_PREREQ (2, 0));
],
[
- AC_TRY_LINK([#define _XOPEN_SOURCE 600
-#define _BSD_SOURCE
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <dirent.h>
-#include <time.h>], glibc_workaround_test(),
- [
- AC_DEFINE([_XOPEN_SOURCE], [600], [Required to unbreak glibc])
- AC_DEFINE([_BSD_SOURCE], [1], [Required to unbreak glibc])
- AC_MSG_RESULT([yes])
- ],
- [
- AC_MSG_RESULT([no])
- ])
+ AC_DEFINE([_XOPEN_SOURCE], [600], [Required to unbreak glibc])
+ AC_DEFINE([_BSD_SOURCE], [1], [Required to unbreak glibc])
+ AC_MSG_RESULT([yes])
+],
+[
+ AC_MSG_RESULT([no])
])
dnl ******************************
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
