Mercurial > octave

comparison configure.ac @ 25581:9f422e49be15 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
transform libiconv.dll.a to -liconv for mkoctfile (bug #53920) * configure.ac (MKOCTFILE_GNULIB_DEPS): Use $MKOCTFILE_LIBICONV instead of $LIBICONV. (MKOCTFILE_LIBICONV): New temporary variable. On mingw systems, define by transforming libiconv.dll.a to -liconv in the LIBICONV variable defined by gnulib.
author John W. Eaton <jwe@octave.org>
date Wed, 11 Jul 2018 11:15:29 -0400
parents 4fe32753cb56
children 3858334e81c4 77360cb4aaa0
comparison
equal deleted inserted replaced
25579:07c2c42f457e 25581:9f422e49be15
2810 2810
2811 ### These are recommended by the gnulib bootstrap script: 2811 ### These are recommended by the gnulib bootstrap script:
2812 2812
2813 GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LTLIBICONV $LTLIBINTL $LTLIBTHREAD" 2813 GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $LTLIBICONV $LTLIBINTL $LTLIBTHREAD"
2814 2814
2815 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" 2815 ### FIXME: This is a kluge to transform $libdir/libiconv.dll.a to -liconv.
2816 ### It would probably be better to fix gnulib to not give us an absolute
2817 ### file name...
2818
2819 case $host_os in
2820 mingw*)
2821 ## Don't use $libdir here because that's defined to be
2822 ## ${exec_prefix}/lib and at this point, ${exec_prefix} is "NONE"!
2823 tmp_libiconv_dll="$LIBICONV_PREFIX/lib/libiconv.dll.a"
2824 MKOCTFILE_LIBICONV=`echo $LIBICONV | sed "s|$tmp_libiconv_dll|-liconv|"`
2825 ;;
2826 *)
2827 MKOCTFILE_LIBICONV="$LIBICONV"
2828 ;;
2829 esac
2830
2831 MKOCTFILE_GNULIB_LINK_DEPS="$FREXPF_LIBM $FREXP_LIBM $GETHOSTNAME_LIB $LIBSOCKET $LIB_CLOCK_GETTIME $LIB_CRYPTO $LIB_GETLOGIN $LIB_NANOSLEEP $LIB_SELECT $MKOCTFILE_LIBICONV $LIBINTL $LIBTHREAD"
2816 2832
2817 AC_SUBST(GNULIB_LINK_DEPS) 2833 AC_SUBST(GNULIB_LINK_DEPS)
2818 2834
2819 BASE_LIBOCTAVE_LINK_DEPS="$CURL_LIBS $SPARSE_XLIBS $ARPACK_LIBS $QRUPDATE_LIBS $FFTW_XLIBS $LAPACK_LIBS $BLAS_LIBS $READLINE_LIBS $TERM_LIBS $LIBGLOB $PCRE_LIBS $DL_LIBS $PTHREAD_LIBS $FLIBS $LIBS" 2835 BASE_LIBOCTAVE_LINK_DEPS="$CURL_LIBS $SPARSE_XLIBS $ARPACK_LIBS $QRUPDATE_LIBS $FFTW_XLIBS $LAPACK_LIBS $BLAS_LIBS $READLINE_LIBS $TERM_LIBS $LIBGLOB $PCRE_LIBS $DL_LIBS $PTHREAD_LIBS $FLIBS $LIBS"
2820 2836