Mercurial > octave
changeset 23983:3a07616e660b
eliminate custom checks for dirent library (bug #51830)
We get dirent.h and the functions it provides from gnulib.
* configure.ac: Don't call AC_HEADER_DIRENT. Eliminate checks for
dirent library on Windows systems.
* bootstrap.conf (gnulib_modules): Also include rewinddir in the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 31 Aug 2017 18:06:38 -0400 |
parents | 3706091dc91c |
children | 05067feb0719 |
files | bootstrap.conf configure.ac |
diffstat | 2 files changed, 1 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/bootstrap.conf Thu Aug 31 15:38:31 2017 -0700 +++ b/bootstrap.conf Thu Aug 31 18:06:38 2017 -0400 @@ -67,6 +67,7 @@ progname putenv readdir + rewinddir rmdir select sigaction
--- a/configure.ac Thu Aug 31 15:38:31 2017 -0700 +++ b/configure.ac Thu Aug 31 18:06:38 2017 -0400 @@ -2254,31 +2254,11 @@ OCTAVE_ENABLE_READLINE -### Check for existence of various libraries - -## OS-specific test for dirent, opendir. -case $host_os in - mingw*) - if test $have_msvc = yes; then - AC_CHECK_LIB([dirent], [opendir]) - LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" - else - LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" - fi - LIBS="$LIBS -lgdi32 -lws2_32 -luser32 -lkernel32" - ;; - msdosmsvc) - AC_CHECK_LIB([dirent], [opendir]) - LIBS="$LIBS -ladvapi32 -lgdi32 -lws2_32 -luser32 -lkernel32" - ;; -esac - ## Find a termlib to use. OCTAVE_CHECK_LIB_TERMLIB ### Checks for header files. -AC_HEADER_DIRENT AC_HEADER_SYS_WAIT ## C headers