Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 00:22:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for STR #2313 (SunOS scandir exception) and avoid double check of

Browse Source 
scandir() if the POSIX compatible header was found.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8436 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser
2011-02-16 12:33:56 +00:00
parent f924432dd5
commit eb0b154ffd
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+13 -6
View File
@@ -472,12 +472,6 @@ dnl Standard headers and functions...
AC_HEADER_DIRENT AC_HEADER_DIRENT
AC_CHECK_HEADER(sys/select.h,AC_DEFINE(HAVE_SYS_SELECT_H)) 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_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? dnl Do we have the POSIX compatible scandir() prototype?
AC_CACHE_CHECK([whether we have the POSIX compatible scandir() prototype], AC_CACHE_CHECK([whether we have the POSIX compatible scandir() prototype],
@@ -494,8 +488,21 @@ AC_CACHE_CHECK([whether we have the POSIX compatible scandir() prototype],
AC_LANG_RESTORE 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 if test "$ac_cv_cxx_scandir_posix" = yes; then
AC_DEFINE(HAVE_SCANDIR)
AC_DEFINE(HAVE_SCANDIR_POSIX) 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 fi
AC_CHECK_FUNC(vsnprintf,[ AC_CHECK_FUNC(vsnprintf,[