Mercurial > octave
changeset 23993:49e37560e0fe
configure: rely on gnulib for detection of clock_gettime
* bootstrap.conf (gnulib_modules): Include clock-time in the list.
* configure.ac: Don't test for clock_gettime, use LIB_CLOCK_GETTIME instead.
Include LIB_CLOCK_GETTIME in standard link dependency lists.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Fri, 01 Sep 2017 12:30:49 -0700 |
| parents | 74fa9f184f92 |
| children | 8785b3717140 |
| files | bootstrap.conf configure.ac |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/bootstrap.conf Fri Sep 01 12:18:19 2017 -0700 +++ b/bootstrap.conf Fri Sep 01 12:30:49 2017 -0700 @@ -25,6 +25,7 @@ base64 canonicalize chdir + clock-time close closedir crypto/md2
--- a/configure.ac Fri Sep 01 12:18:19 2017 -0700 +++ b/configure.ac Fri Sep 01 12:30:49 2017 -0700 @@ -2280,18 +2280,17 @@ ## On some systems, explicitly linking with -lsuitesparseconfig is ## needed when using SuiteSparse libraries. If so, the checks below ## for specific SuiteSparse libraries may fail without it. -## On some systems, explicitly linking with -lrt is also needed. +## Include LIB_CLOCK_GETTIME (from gnulib) on systems where needed. save_LIBS="$LIBS" -AC_CHECK_LIB([rt], [clock_gettime], [SSCONFIG_RT_LIB="-lrt"], []) -LIBS="$SSCONFIG_RT_LIB $LIBS" +LIBS="$LIB_CLOCK_GETTIME $LIBS" OCTAVE_CHECK_LIB(suitesparseconfig, SUITESPARSECONFIG, [], [], [SuiteSparse_time], [], [don't link directly with suitesparseconfig library]) LIBS="$save_LIBS" -if test -n "$SUITESPARSECONFIG_LIBS" && test -n "$SSCONFIG_RT_LIB"; then - SUITESPARSECONFIG_LIBS="$SUITESPARSECONFIG_LIBS $SSCONFIG_RT_LIB" +if test -n "$SUITESPARSECONFIG_LIBS" && test -n "$LIB_CLOCK_GETTIME"; then + SUITESPARSECONFIG_LIBS="$SUITESPARSECONFIG_LIBS $LIB_CLOCK_GETTIME" fi ### Reset below, after all checks for SuiteSparse libraries. @@ -2918,9 +2917,9 @@ ### These are recommended by the gnulib bootstrap script: -GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LTLIBICONV $LTLIBINTL $LTLIBTHREAD" - -MKOCTFILE_GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LIBICONV $LIBINTL $LIBTHREAD" +GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LTLIBICONV $LTLIBINTL $LTLIBTHREAD" + +MKOCTFILE_GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LIBICONV $LIBINTL $LIBTHREAD" AC_SUBST(GNULIB_LINK_DEPS)