anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 05:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix configure with autoconf 2.71

Browse Source 
This fixes two issues with autoconf 2.71

* a new version of eilseq.m4 from libiconv is required ;

* the AC_CHECK_HEADER last `-' argument is obsloleted, but I do not
  think that we needed it in the first place.
This commit is contained in:
Jean-Marc Lasgouttes 2022-04-28 14:36:11 +02:00
parent 769df229dc
commit e4416535e4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/qt.m4
View File

@ -231,10 +231,10 @@ AC_DEFUN([QT_DO_IT_ALL],
CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES" CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
AC_CHECK_HEADER(QtGui/qtgui-config.h, AC_CHECK_HEADER(QtGui/qtgui-config.h,
[lyx_qt5_config=QtGui/qtgui-config.h], [lyx_qt5_config=QtGui/qtgui-config.h],
[lyx_qt5_config=qconfig.h],[-]) [lyx_qt5_config=qconfig.h])
AC_CHECK_HEADER(QtGui/private/qtgui-config_p.h, AC_CHECK_HEADER(QtGui/private/qtgui-config_p.h,
[lyx_qt6_config=QtGui/private/qtgui-config_p.h], [lyx_qt6_config=QtGui/private/qtgui-config_p.h],
[lyx_qt6_config=qconfig.h],[-]) [lyx_qt6_config=qconfig.h])
AC_MSG_CHECKING([whether Qt uses the X Window system]) AC_MSG_CHECKING([whether Qt uses the X Window system])
if test x$USE_QT6 = xyes ; then if test x$USE_QT6 = xyes ; then
dnl FIXME: Check whether defining QPA_XCB makes sense with Qt6 dnl FIXME: Check whether defining QPA_XCB makes sense with Qt6

20
m4/eilseq.m4
View File

@ -1,6 +1,6 @@
#serial 1 #serial 2
AC_PREREQ(2.50) AC_PREREQ([2.61])
# The EILSEQ errno value ought to be defined in <errno.h>, according to # The EILSEQ errno value ought to be defined in <errno.h>, according to
# ISO C 99 and POSIX. But some systems (like SunOS 4) don't define it, # ISO C 99 and POSIX. But some systems (like SunOS 4) don't define it,
@ -16,20 +16,20 @@ AC_DEFUN([AC_EILSEQ],
AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CC])dnl
dnl Check for any extra headers that could define EILSEQ. dnl Check for any extra headers that could define EILSEQ.
AC_CHECK_HEADERS(wchar.h) AC_CHECK_HEADERS([wchar.h])
AC_CACHE_CHECK([for EILSEQ], ac_cv_decl_EILSEQ, [ AC_CACHE_CHECK([for EILSEQ], [ac_cv_decl_EILSEQ], [
AC_EGREP_CPP(yes,[ AC_EGREP_CPP([yes],[
#include <errno.h> #include <errno.h>
#ifdef EILSEQ #ifdef EILSEQ
yes yes
#endif #endif
], have_eilseq=1) ], [have_eilseq=1])
if test -n "$have_eilseq"; then if test -n "$have_eilseq"; then
dnl EILSEQ exists in <errno.h>. Don't need to define EILSEQ ourselves. dnl EILSEQ exists in <errno.h>. Don't need to define EILSEQ ourselves.
ac_cv_decl_EILSEQ=yes ac_cv_decl_EILSEQ=yes
else else
AC_EGREP_CPP(yes,[ AC_EGREP_CPP([yes],[
#include <errno.h> #include <errno.h>
#if HAVE_WCHAR_H #if HAVE_WCHAR_H
#include <wchar.h> #include <wchar.h>
@ -37,11 +37,11 @@ yes
#ifdef EILSEQ #ifdef EILSEQ
yes yes
#endif #endif
], have_eilseq=1) ], [have_eilseq=1])
if test -n "$have_eilseq"; then if test -n "$have_eilseq"; then
dnl EILSEQ exists in some other system header. dnl EILSEQ exists in some other system header.
dnl Define it to the same value. dnl Define it to the same value.
_AC_COMPUTE_INT([EILSEQ], ac_cv_decl_EILSEQ, [ AC_COMPUTE_INT([ac_cv_decl_EILSEQ], [EILSEQ], [
#include <errno.h> #include <errno.h>
#if HAVE_WCHAR_H #if HAVE_WCHAR_H
#include <wchar.h> #include <wchar.h>
@ -62,6 +62,6 @@ yes
AC_DEFINE_UNQUOTED([EILSEQ], [$ac_cv_decl_EILSEQ], AC_DEFINE_UNQUOTED([EILSEQ], [$ac_cv_decl_EILSEQ],
[Define as good substitute value for EILSEQ.]) [Define as good substitute value for EILSEQ.])
EILSEQ="$ac_cv_decl_EILSEQ" EILSEQ="$ac_cv_decl_EILSEQ"
AC_SUBST(EILSEQ) AC_SUBST([EILSEQ])
fi fi
]) ])