Mercurial > hg > octave-nkf
changeset 19550:22289e6e316e
build: Remove unused TEXINFO_LIBNAME definitions from Makefiles.
* build-aux/common.mk: Remove substitution of makefile TEXINFO_LIBNAME
variables with autoconf variables of the same name.
* configure.ac: Remove TEXINFO_QHULL, TEXINFO_HDF5, TEXINFO_GLPK
definitions.
* m4/acinclude.m4: Remove declaration of TEXINFO_LIBNAME in OCTAVE_CHECK_LIB
macro.
author | Rik <rik@octave.org> |
---|---|
date | Tue, 25 Nov 2014 08:36:46 -0800 |
parents | cc6000ccd627 |
children | 3ea57d22d9eb |
files | build-aux/common.mk configure.ac m4/acinclude.m4 |
diffstat | 3 files changed, 3 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/common.mk +++ b/build-aux/common.mk @@ -314,11 +314,6 @@ USE_64_BIT_IDX_T = @USE_64_BIT_IDX_T@ OCTAVE_IDX_TYPE = @OCTAVE_IDX_TYPE@ -TEXINFO_COLAMD = @TEXINFO_COLAMD@ -TEXINFO_CHOLMOD = @TEXINFO_CHOLMOD@ -TEXINFO_UMFPACK = @TEXINFO_UMFPACK@ -TEXINFO_QHULL = @TEXINFO_QHULL@ - # The arguments passed to configure. config_opts = @config_opts@
--- a/configure.ac +++ b/configure.ac @@ -708,8 +708,7 @@ [warn_qhull= OCTAVE_CHECK_QHULL_VERSION OCTAVE_CHECK_LIB_QHULL_OK( - [TEXINFO_QHULL="@set HAVE_QHULL" - AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], + [AC_DEFINE(HAVE_QHULL, 1, [Define to 1 if Qhull is available.])], [warn_qhull="Qhull library found, but does not seem to work properly. This will result in loss of functionality of some geometry functions. Please try recompiling the library with -fno-strict-aliasing."])]) ### Check for PCRE regex library. @@ -891,7 +890,6 @@ [hdf5.h], [H5Gget_num_objs], [], [], [warn_hdf5= OCTAVE_CHECK_HDF5_HAS_VER_16_API - TEXINFO_HDF5="@set HAVE_HDF5" AC_DEFINE(HAVE_HDF5, 1, [Define to 1 if HDF5 is available and newer than version 1.6.]) if test $have_msvc = yes; then @@ -958,8 +956,7 @@ [glpk/glpk.h glpk.h], [glp_simplex], [], [], [warn_glpk= OCTAVE_CHECK_LIB_GLPK_OK( - [TEXINFO_GLPK="@set HAVE_GLPK" - AC_DEFINE(HAVE_GLPK, 1, [Define to 1 if GLPK is available.])], + [AC_DEFINE(HAVE_GLPK, 1, [Define to 1 if GLPK is available.])], [warn_glpk="GLPK library found, but does not seem to work properly -- disabling glpk function"])]) LIBS="$save_LIBS" CPPFLAGS="$save_CPPFLAGS"
--- a/m4/acinclude.m4 +++ b/m4/acinclude.m4 @@ -598,7 +598,6 @@ ;; esac - [TEXINFO_]m4_toupper([$1])= warn_$1="$3" m4_set_add([summary_warning_list], [warn_$1]) @@ -623,8 +622,7 @@ m4_ifblank([$8], [ warn_$1= AC_DEFINE([HAVE_]m4_toupper([$1]), 1, - [Define to 1 if $2 is available.]) - [TEXINFO_]m4_toupper([$1])="@set [HAVE_]m4_toupper([$1])"], [$8]) + [Define to 1 if $2 is available.])], [$8]) fi fi m4_ifnblank([$6], [AC_LANG_POP($6)]) @@ -634,7 +632,6 @@ fi AC_SUBST(m4_toupper([$1])_LIBS) - AC_SUBST([TEXINFO_]m4_toupper([$1])) if test -n "$warn_$1"; then AC_MSG_WARN([$warn_$1]) m4_toupper([$1])_LIBS=