diff --git a/config/qt.m4 b/config/qt.m4 index 05fa9ce5ca..8c1a818b33 100644 --- a/config/qt.m4 +++ b/config/qt.m4 @@ -231,10 +231,10 @@ AC_DEFUN([QT_DO_IT_ALL], CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES" AC_CHECK_HEADER(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, [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]) if test x$USE_QT6 = xyes ; then dnl FIXME: Check whether defining QPA_XCB makes sense with Qt6 diff --git a/m4/eilseq.m4 b/m4/eilseq.m4 index 792d514b59..5f86ab3741 100644 --- a/m4/eilseq.m4 +++ b/m4/eilseq.m4 @@ -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 , according to # 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 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_EGREP_CPP(yes,[ + AC_CACHE_CHECK([for EILSEQ], [ac_cv_decl_EILSEQ], [ + AC_EGREP_CPP([yes],[ #include #ifdef EILSEQ yes #endif - ], have_eilseq=1) + ], [have_eilseq=1]) if test -n "$have_eilseq"; then dnl EILSEQ exists in . Don't need to define EILSEQ ourselves. ac_cv_decl_EILSEQ=yes else - AC_EGREP_CPP(yes,[ + AC_EGREP_CPP([yes],[ #include #if HAVE_WCHAR_H #include @@ -37,11 +37,11 @@ yes #ifdef EILSEQ yes #endif - ], have_eilseq=1) + ], [have_eilseq=1]) if test -n "$have_eilseq"; then dnl EILSEQ exists in some other system header. dnl Define it to the same value. - _AC_COMPUTE_INT([EILSEQ], ac_cv_decl_EILSEQ, [ + AC_COMPUTE_INT([ac_cv_decl_EILSEQ], [EILSEQ], [ #include #if HAVE_WCHAR_H #include @@ -62,6 +62,6 @@ yes AC_DEFINE_UNQUOTED([EILSEQ], [$ac_cv_decl_EILSEQ], [Define as good substitute value for EILSEQ.]) EILSEQ="$ac_cv_decl_EILSEQ" - AC_SUBST(EILSEQ) + AC_SUBST([EILSEQ]) fi ])