anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-13 22:49:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix configure script with autoconf 2.71

Browse Source 
Not a backport, but related to e4416535.
This commit is contained in:
Jean-Marc Lasgouttes 2022-06-24 13:27:55 +02:00
parent 2849127f44
commit 9fc89762ee
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/lyxinclude.m4
View File

@ -49,7 +49,7 @@ AC_MSG_CHECKING([for version suffix])
dnl We need the literal double quotes in the rpm spec file dnl We need the literal double quotes in the rpm spec file
RPM_VERSION_SUFFIX='""' RPM_VERSION_SUFFIX='""'
AC_ARG_WITH(version-suffix, AC_ARG_WITH(version-suffix,
[AS_HELP_STRING([--with-version-suffix@<:@=STR@:>@],[install lyx files as lyxSTR (default STR: -AC_PACKAGE_VERSION)])], [AS_HELP_STRING([--with-version-suffix@<:@=STR@:>@], install lyx files as lyxSTR (default STR: -AC_PACKAGE_VERSION))],
[if test "x$withval" = "xyes"; [if test "x$withval" = "xyes";
then then
withval="-"AC_PACKAGE_VERSION withval="-"AC_PACKAGE_VERSION

2
config/qt4.m4
View File

@ -179,7 +179,7 @@ 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_MSG_CHECKING([whether Qt uses the X Window system]) AC_MSG_CHECKING([whether Qt uses the X Window system])
if test x$USE_QT5 = xyes ; then if test x$USE_QT5 = xyes ; then
AC_EGREP_CPP(xcb, AC_EGREP_CPP(xcb,

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
]) ])