Mercurial > octave
changeset 25581:9f422e49be15 stable
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 | 07c2c42f457e |
| children | 18148dc92122 |
| files | configure.ac |
| diffstat | 1 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Jul 11 08:40:07 2018 -0700 +++ b/configure.ac Wed Jul 11 11:15:29 2018 -0400 @@ -2812,7 +2812,23 @@ 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" +### FIXME: This is a kluge to transform $libdir/libiconv.dll.a to -liconv. +### It would probably be better to fix gnulib to not give us an absolute +### file name... + +case $host_os in + mingw*) + ## Don't use $libdir here because that's defined to be + ## ${exec_prefix}/lib and at this point, ${exec_prefix} is "NONE"! + tmp_libiconv_dll="$LIBICONV_PREFIX/lib/libiconv.dll.a" + MKOCTFILE_LIBICONV=`echo $LIBICONV | sed "s|$tmp_libiconv_dll|-liconv|"` + ;; + *) + MKOCTFILE_LIBICONV="$LIBICONV" + ;; +esac + +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" AC_SUBST(GNULIB_LINK_DEPS)