]> git.eshelyaron.com Git - emacs.git/commitdiff
Fix configure.ac quoting of AC_CHECK_LIB's 2nd arg
authorJim Meyering <meyering@fb.com>
Mon, 27 Jun 2022 04:26:01 +0000 (21:26 -0700)
committerEli Zaretskii <eliz@gnu.org>
Tue, 28 Jun 2022 11:27:55 +0000 (14:27 +0300)
Running an autoconf-head-generated configure, would fail like this:
  /emacs/configure: line 18002: syntax error near unexpected token `;;'
  /emacs/configure: line 18002: `  ;;'
That is due to under-quoting of AC_CHECK_LIB's second argument, which led to
the comma in an embedded string being interpreted as paramater-delimiting.
* configure.ac: Quote the second arg of each AC_CHECK_LIB invocation.
(Bug#56272)

Copyright-paperwork-exempt: yes

configure.ac

index c91b7de322ad303ee99e1d4e4176e27fd2c24900..17f86627a7dac5d98f2add8b82c08a1bb8667c4e 100644 (file)
@@ -3622,7 +3622,7 @@ if test "${HAVE_X11}" = "yes"; then
        CFLAGS="$CFLAGS $XFT_CFLAGS"
        LIBS="$XFT_LIBS $LIBS"
        AC_CHECK_HEADER(X11/Xft/Xft.h,
-         AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS) , ,
+          [AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS)] , ,
           [[#include <X11/X.h>]])
 
        if test "${HAVE_XFT}" = "yes"; then
@@ -3818,7 +3818,7 @@ AC_SUBST(M17N_FLT_LIBS)
 XCB_LIBS=
 if test "${HAVE_X11}" = "yes"; then
   AC_CHECK_HEADER(X11/Xlib-xcb.h,
-    AC_CHECK_LIB(xcb, xcb_translate_coordinates, HAVE_XCB=yes))
+    [AC_CHECK_LIB(xcb, xcb_translate_coordinates, HAVE_XCB=yes)])
   if test "${HAVE_XCB}" = "yes"; then
     AC_CHECK_LIB(X11-xcb, XGetXCBConnection, HAVE_X11_XCB=yes)
     if test "${HAVE_X11_XCB}" = "yes"; then
@@ -4597,7 +4597,7 @@ XSYNC_CFLAGS=
 HAVE_XSYNC=no
 if test "${HAVE_X11}" = "yes"; then
    AC_CHECK_HEADER(X11/extensions/sync.h,
-     AC_CHECK_LIB(Xext, XSyncQueryExtension, HAVE_XSYNC=yes),
+     [AC_CHECK_LIB(Xext, XSyncQueryExtension, HAVE_XSYNC=yes)],
      [], [#include <X11/Xlib.h>])
 
   if test "${HAVE_XSYNC}" = "yes"; then