Mercurial > octave
diff configure.ac @ 9989:d36f8c473dff
use glob and fnmatch from gnulib
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 15 Dec 2009 14:27:18 -0500 |
parents | cc7ea6083774 |
children | 2ea3110e15ed |
line wrap: on
line diff
--- a/configure.ac Tue Dec 15 13:07:05 2009 +0100 +++ b/configure.ac Tue Dec 15 14:27:18 2009 -0500 @@ -1406,7 +1406,6 @@ AC_CHECK_HEADERS(termios.h, have_termios_h=yes) AC_CHECK_HEADERS(termio.h, have_termio_h=yes, have_termio_h=no) AC_CHECK_HEADERS(sgtty.h, have_sgtty_h=yes, have_sgtty_h=no) -AC_CHECK_HEADERS(glob.h, have_glob_h=yes, have_glob_h=no) AC_CHECK_HEADERS(fnmatch.h, have_fnmatch_h=yes, have_fnmatch_h=no) AC_CHECK_HEADERS(conio.h, have_conio_h=yes, have_conio_h=no) @@ -1429,23 +1428,6 @@ AC_MSG_WARN([I couldn't find termios.h, termio.h, or sgtty.h!]) fi -LIBGLOB= -AC_SUBST(LIBGLOB) -if test "$have_fnmatch_h" = yes && test "$have_glob_h" = yes; then - AC_CHECK_FUNCS(fnmatch, have_fnmatch=yes, [ - AC_CHECK_LIB(glob, fnmatch, [have_fnmatch=yes; LIBGLOB=-lglob], - have_fnmatch=no)]) - AC_CHECK_FUNCS(glob, have_glob=yes, [ - AC_CHECK_LIB(glob, glob, [have_glob=yes; LIBGLOB=-lglob], - have_glob=no)]) - - if test "$have_fnmatch" != yes || test "$have_glob" != yes; then - AC_MSG_ERROR([You are required to have fnmatch and glob]) - fi -else - AC_MSG_ERROR([You are required to have fnmatch.h and glob.h]) -fi - ### Checks for functions and variables. AC_CHECK_FUNCS(atexit basename bcopy bzero canonicalize_file_name \ @@ -2163,7 +2145,6 @@ C++ compiler: $CXX $XTRA_CXXFLAGS $WARN_CXXFLAGS $CXXFLAGS Fortran compiler: $F77 $FFLAGS Fortran libraries: $FLIBS - Glob libraries: $LIBGLOB Lex libraries: $LEXLIB LIBS: $LIBS