From 2f701e6a1c6b2a487a28c7a212421aef21f1b58c Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Thu, 2 Mar 2017 14:31:43 +0100 Subject: [PATCH] Clarify configure help for 3rd party code The configure code suggests that the default for --with-included-(iconv|zlib|hunspell) is "yes", which is wrong: by default is indeed to use the system libraries. Change the MyThes detection to use the system version by default. Also add to the verison information a line which lists the bundled libraries. --- config/lyxinclude.m4 | 15 +++++++++++---- config/spell.m4 | 3 ++- configure.ac | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index 7bddfb09da..1fa216c304 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -449,6 +449,7 @@ AC_DEFUN([LYX_USE_INCLUDED_BOOST],[ AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes) AC_MSG_RESULT([$lyx_cv_with_included_boost]) if test x$lyx_cv_with_included_boost = xyes ; then + lyx_included_libs="$lyx_included_libs boost" BOOST_INCLUDES='-I$(top_srcdir)/3rdparty/boost' if test $lyx_std_regex = yes ; then BOOST_LIBS="" @@ -507,12 +508,14 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_ICONV],[ AC_MSG_CHECKING([whether to use included iconv library]) AC_ARG_WITH(included-iconv, - [AC_HELP_STRING([--without-included-iconv], [do not use the iconv lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [AC_HELP_STRING([--with-included-iconv], [use the iconv lib supplied with LyX instead of the system one])], [lyx_cv_with_included_iconv=$withval], [lyx_cv_with_included_iconv=no]) AM_CONDITIONAL(USE_INCLUDED_ICONV, test x$lyx_cv_with_included_iconv = xyes) AC_MSG_RESULT([$lyx_cv_with_included_iconv]) if test x$lyx_cv_with_included_iconv = xyes ; then + lyx_included_libs="$lyx_included_libs iconv" + dnl Some bits from libiconv configure.ac to avoid a nested configure call: AC_EILSEQ AC_TYPE_MBSTATE_T @@ -571,12 +574,13 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_ZLIB],[ AC_MSG_CHECKING([whether to use included zlib library]) AC_ARG_WITH(included-zlib, - [AC_HELP_STRING([--without-included-zlib], [do not use the zlib lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [AC_HELP_STRING([--with-included-zlib], [use the zlib lib supplied with LyX instead of the system one])], [lyx_cv_with_included_zlib=$withval], [lyx_cv_with_included_zlib=no]) AM_CONDITIONAL(USE_INCLUDED_ZLIB, test x$lyx_cv_with_included_zlib = xyes) AC_MSG_RESULT([$lyx_cv_with_included_zlib]) if test x$lyx_cv_with_included_zlib = xyes ; then + lyx_included_libs="$lyx_included_libs zlib" ZLIB_INCLUDES='-I$(top_srcdir)/3rdparty/zlib/1.2.8 -I$(top_builddir)/3rdparty/zlib' ZLIB_LIBS='$(top_builddir)/3rdparty/zlib/liblyxzlib.a' mkdir -p 3rdparty/zlib @@ -624,9 +628,9 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ AC_MSG_CHECKING([whether to use included MyThes library]) AC_ARG_WITH(included-mythes, - [AC_HELP_STRING([--without-included-mythes], [do not use the MyThes lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [AC_HELP_STRING([--with-included-mythes], [use the MyThes lib supplied with LyX instead of the system one])], [lyx_cv_with_included_mythes=$withval], - [lyx_cv_with_included_mythes=yes]) + [lyx_cv_with_included_mythes=no]) AM_CONDITIONAL(USE_INCLUDED_MYTHES, test x$lyx_cv_with_included_mythes = xyes) AC_MSG_RESULT([$lyx_cv_with_included_mythes]) if test x$lyx_cv_with_included_mythes != xyes ; then @@ -646,7 +650,10 @@ AC_DEFUN([LYX_USE_INCLUDED_MYTHES],[ AC_DEFINE(USE_EXTERNAL_MYTHES, 1, [Define as 1 to use an external MyThes library]) AC_DEFINE_UNQUOTED(MYTHES_H_LOCATION,$lyx_cv_mythes_h_location,[Location of mythes.hxx]) AC_SUBST(MYTHES_LIBS) + else + lyx_included_libs="$lyx_included_libs mythes" fi + ]) diff --git a/config/spell.m4 b/config/spell.m4 index fffad96aa5..c733dab2b4 100644 --- a/config/spell.m4 +++ b/config/spell.m4 @@ -73,12 +73,13 @@ dnl be used. AC_DEFUN([LYX_USE_INCLUDED_HUNSPELL],[ AC_MSG_CHECKING([whether to use included hunspell library]) AC_ARG_WITH(included-hunspell, - [AC_HELP_STRING([--without-included-hunspell], [do not use the hunspell lib supplied with LyX, try to find one in the system directories - compilation will abort if nothing suitable is found])], + [AC_HELP_STRING([--with-included-hunspell], [use the hunspell lib supplied with LyX instead of the system one])], [lyx_cv_with_included_hunspell=$withval], [lyx_cv_with_included_hunspell=no]) AM_CONDITIONAL(USE_INCLUDED_HUNSPELL, test x$lyx_cv_with_included_hunspell = xyes) AC_MSG_RESULT([$lyx_cv_with_included_hunspell]) if test x$lyx_cv_with_included_hunspell = xyes ; then + lyx_included_libs="$lyx_included_libs hunspell" HUNSPELL_CFLAGS='-I$(top_srcdir)/3rdparty/hunspell/1.3.3/src' HUNSPELL_LIBS='$(top_builddir)/3rdparty/hunspell/liblyxhunspell.a' AC_SUBST(HUNSPELL_CFLAGS) diff --git a/configure.ac b/configure.ac index 75df6c75de..d203049bf9 100644 --- a/configure.ac +++ b/configure.ac @@ -256,9 +256,11 @@ LYX_SET_VERSION_INFO real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"` real_pkgdatadir=`eval "echo \`eval \"echo \\\`eval \\\"echo ${pkgdatadir}\\\"\\\`\"\`"` real_localedir=`eval "echo \`eval \"echo ${datadir}/locale\"\`"` +test -z "${lyx_included_libs}" && lyx_included_libs="(none)" VERSION_INFO="Configuration\n\ Host type: ${host}\n\ Special build flags: ${lyx_flags}\n\ + Bundled libraries: ${lyx_included_libs}\n\ C++ Compiler: ${CXX} ${CXX_VERSION}\n\ C++ Compiler flags: ${AM_CPPFLAGS} ${AM_CXXFLAGS}\n\ C++ Compiler user flags: ${CPPFLAGS} ${CXXFLAGS}\n\ -- 2.39.2