summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <jan.nijtmans@noemail.net>2013-07-02 07:26:20 (GMT)
committerjan.nijtmans <jan.nijtmans@noemail.net>2013-07-02 07:26:20 (GMT)
commit3171cf74222e4e614618869505d68f98c1d0368e (patch)
tree0b46425666e8d42050bfd5570d099d9e6264730a
parentf5089e8b820a70c41772ac0050203722d1785aff (diff)
parent093e9e283d317aa3c96fa3050b8033d7bb7e862e (diff)
downloadtk-3171cf74222e4e614618869505d68f98c1d0368e.zip
tk-3171cf74222e4e614618869505d68f98c1d0368e.tar.gz
tk-3171cf74222e4e614618869505d68f98c1d0368e.tar.bz2
Bug [32afa6e256]: dirent64 check is incorrect in tcl.m4. Thanks to Brian Griffin.
FossilOrigin-Name: f3fee9f1fa0c1df91f9712887c38c8285e073dfc
-rw-r--r--ChangeLog5
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c3a97c3..08e4d9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-02 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * unix/tcl.m4: Bug [32afa6e256]: dirent64 check is incorrect in tcl.m4
+ * unix/configure: (thanks to Brian Griffin)
+
2012-06-28 Jan Nijtmans <nijtmans@users.sf.net>
* library/ttk/scale.tcl: [Bug 2501278]: ttk::scale keyboard binding
diff --git a/unix/configure b/unix/configure
index 7bc80dc..764c597 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7611,7 +7611,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/types.h>
-#include <sys/dirent.h>
+#include <dirent.h>
int
main ()
{
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 43e2b78..b69d5a6 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2640,7 +2640,7 @@ AC_DEFUN([SC_TCL_64BIT_FLAGS], [
# Now check for auxiliary declarations
AC_CACHE_CHECK([for struct dirent64], tcl_cv_struct_dirent64,[
AC_TRY_COMPILE([#include <sys/types.h>
-#include <sys/dirent.h>],[struct dirent64 p;],
+#include <dirent.h>],[struct dirent64 p;],
tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)])
if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
AC_DEFINE(HAVE_STRUCT_DIRENT64, 1, [Is 'struct dirent64' in <sys/types.h>?])