Mercurial > octave
changeset 21450:2868abbc88eb
eliminate unused configuration variable SHLLINKEXT
* common.mk, configure.ac (SHLLINKEXT): Delete unused variable.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh:
Don't substitute it.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 14 Mar 2016 23:22:32 -0400 |
| parents | 65e24ba4ca2d |
| children | 763e30285935 |
| files | build-aux/common.mk build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh configure.ac |
| diffstat | 4 files changed, 2 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk Mon Mar 14 23:12:57 2016 -0400 +++ b/build-aux/common.mk Mon Mar 14 23:22:32 2016 -0400 @@ -14,10 +14,6 @@ AM_YFLAGS = -dv -# FIXME: This seems unnecessary as of 3/10/2016. -# Commenting out definition and re-configuring made no change to Makefile -SHLLINKEXT = - # Fortran compiler flags. AM_FFLAGS = @FFLAGS@
--- a/build-aux/subst-config-vals.in.sh Mon Mar 14 23:12:57 2016 -0400 +++ b/build-aux/subst-config-vals.in.sh Mon Mar 14 23:22:32 2016 -0400 @@ -152,7 +152,6 @@ SED="@SED@" SHARED_LIBS="@SHARED_LIBS@" SHLEXT="@SHLEXT@" -SHLLINKEXT="@SHLLINKEXT@" SHLEXT_VER="@SHLEXT_VER@" SH_LD="@SH_LD@" SH_LDFLAGS="@SH_LDFLAGS@" @@ -309,7 +308,6 @@ -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \ - -e "s|%OCTAVE_CONF_SHLLINKEXT%|\"${SHLLINKEXT}\"|" \ -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \ -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
--- a/build-aux/subst-cross-config-vals.in.sh Mon Mar 14 23:12:57 2016 -0400 +++ b/build-aux/subst-cross-config-vals.in.sh Mon Mar 14 23:22:32 2016 -0400 @@ -156,7 +156,6 @@ SED="@SED@" SHARED_LIBS="@SHARED_LIBS@" SHLEXT="@SHLEXT@" -SHLLINKEXT="@SHLLINKEXT@" SHLEXT_VER="@SHLEXT_VER@" SH_LD="@SH_LD@" SH_LDFLAGS="@SH_LDFLAGS@" @@ -313,7 +312,6 @@ -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \ -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \ - -e "s|%OCTAVE_CONF_SHLLINKEXT%|\"${SHLLINKEXT}\"|" \ -e "s|%OCTAVE_CONF_SHLEXT_VER%|\"${SHLEXT_VER}\"|" \ -e "s|%OCTAVE_CONF_SH_LD%|\"${SH_LD}\"|" \ -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \
--- a/configure.ac Mon Mar 14 23:12:57 2016 -0400 +++ b/configure.ac Mon Mar 14 23:22:32 2016 -0400 @@ -2004,7 +2004,6 @@ SHLEXT_VER="${SHLEXT}.${version}" SHLLIB_VER="${SHLLIB}.${version}" SHLBIN_VER="${SHLBIN}.${version}" -SHLLINKEXT= LIBPRE=lib SHLPRE=lib SHLLIBPRE=lib @@ -2222,7 +2221,6 @@ AC_MSG_NOTICE([defining SHLEXT_VER to be $SHLEXT_VER]) AC_MSG_NOTICE([defining SHLLIB_VER to be $SHLLIB_VER]) AC_MSG_NOTICE([defining SHLBIN_VER to be $SHLBIN_VER]) -AC_MSG_NOTICE([defining SHLLINKEXT to be $SHLLINKEXT]) AC_MSG_NOTICE([defining LIBPRE to be $LIBPRE]) AC_MSG_NOTICE([defining SHLPRE to be $SHLPRE]) AC_MSG_NOTICE([defining SHLLIBPRE to be $SHLLIBPRE]) @@ -2251,7 +2249,6 @@ AC_SUBST(SHLEXT_VER) AC_SUBST(SHLLIB_VER) AC_SUBST(SHLBIN_VER) -AC_SUBST(SHLLINKEXT) AC_SUBST(LIBPRE) AC_SUBST(SHLPRE) AC_SUBST(SHLLIBPRE) @@ -2369,8 +2366,8 @@ [test $ENABLE_DYNAMIC_LINKING = yes]) if test $SHARED_LIBS = yes; then - LIBOCTINTERP="-loctinterp$SHLLINKEXT" - LIBOCTAVE="-loctave$SHLLINKEXT" + LIBOCTINTERP="-loctinterp" + LIBOCTAVE="-loctave" else LIBOCTINTERP="${top_builddir}/libinterp/liboctinterp.${LIBEXT}" LIBOCTAVE="${top_builddir}/liboctave/liboctave.${LIBEXT}"