Author: AlbrechtS
Date: 2011-02-16 04:33:56 -0800 (Wed, 16 Feb 2011)
New Revision: 8436
Log:
Fix for STR #2313 (SunOS scandir exception) and avoid double check of
scandir() if the POSIX compatible header was found.
Modified:
branches/branch-1.3/configure.in
Modified: branches/branch-1.3/configure.in
===================================================================
--- branches/branch-1.3/configure.in 2011-02-16 12:30:50 UTC (rev 8435)
+++ branches/branch-1.3/configure.in 2011-02-16 12:33:56 UTC (rev 8436)
@@ -472,12 +472,6 @@
AC_HEADER_DIRENT
AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H))
AC_CHECK_HEADER(sys/stdtypes.h,AC_DEFINE(HAVE_SYS_SELECT_H))
-AC_CHECK_FUNC(scandir,
- if test "x$uname" = xSunOS -o "x$uname" = xQNX; then
- AC_MSG_WARN(Not using $uname scandir emulation function.)
- else
- AC_DEFINE(HAVE_SCANDIR)
- fi)
dnl Do we have the POSIX compatible scandir() prototype?
AC_CACHE_CHECK([whether we have the POSIX compatible scandir() prototype],
@@ -494,8 +488,21 @@
AC_LANG_RESTORE
])
+dnl Define both HAVE_SCANDIR... macros, if the POSIX compatible function is
+dnl available. Otherwise: check, whether any scandir prototype is available,
+dnl but don't use it on SunOS and QNX because of an incompatibility in pre-Y2K
+dnl SunOS scandir versions. We assume, though, that the POSIX compatible
+dnl version on newer SunOS/Solaris versions works as expected.
if test "$ac_cv_cxx_scandir_posix" = yes; then
+ AC_DEFINE(HAVE_SCANDIR)
AC_DEFINE(HAVE_SCANDIR_POSIX)
+else
+ AC_CHECK_FUNC(scandir,
+ if test "x$uname" = xSunOS -o "x$uname" = xQNX; then
+ AC_MSG_WARN(Not using $uname scandir emulation function.)
+ else
+ AC_DEFINE(HAVE_SCANDIR)
+ fi)
fi
AC_CHECK_FUNC(vsnprintf,[
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
