groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 06/15: m4/groff.m4 (GROFF_X11): Fix code style nits.


From: G. Branden Robinson
Subject: [groff] 06/15: m4/groff.m4 (GROFF_X11): Fix code style nits.
Date: Fri, 3 Jun 2022 05:04:51 -0400 (EDT)

gbranden pushed a commit to branch master
in repository groff.

commit 4217304fed9cd062a5234e1211012432166f8420
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Wed Jun 1 13:17:14 2022 -0500

    m4/groff.m4 (GROFF_X11): Fix code style nits.
    
    Update quotation, indentation, and "brace style" to match recent
    practice.
---
 m4/groff.m4 | 81 ++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/m4/groff.m4 b/m4/groff.m4
index 561a1721..9c2cb224 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1490,61 +1490,64 @@ make an error "Path separator is ';'"
 
 # Check for X11.
 
-AC_DEFUN([GROFF_X11],
-  [AC_REQUIRE([AC_PATH_XTRA])
-   groff_no_x=$no_x
-   if test -z "$groff_no_x"; then
-     OLDCFLAGS=$CFLAGS
-     OLDLDFLAGS=$LDFLAGS
-     OLDLIBS=$LIBS
-     CFLAGS="$CFLAGS $X_CFLAGS"
-     LDFLAGS="$LDFLAGS $X_LIBS"
-     LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
-
-     LIBS="$LIBS -lXaw"
-     AC_MSG_CHECKING([for Xaw library and header files])
-     AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([[
+AC_DEFUN([GROFF_X11], [
+  AC_REQUIRE([AC_PATH_XTRA])
+  groff_no_x=$no_x
+  if test -z "$groff_no_x"
+  then
+    OLDCFLAGS=$CFLAGS
+    OLDLDFLAGS=$LDFLAGS
+    OLDLIBS=$LIBS
+    CFLAGS="$CFLAGS $X_CFLAGS"
+    LDFLAGS="$LDFLAGS $X_LIBS"
+    LIBS="$LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+
+    LIBS="$LIBS -lXaw"
+    AC_MSG_CHECKING([for Xaw library and header files])
+    AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([[
 
 #include <X11/Intrinsic.h>
 #include <X11/Xaw/Simple.h>
 
-        ]],
-        [])
-       ],
-       [AC_MSG_RESULT([yes])],
-       [AC_MSG_RESULT([no])
-       groff_no_x="yes"])
+        ]],
+        [])
+      ],
+      [AC_MSG_RESULT([yes])],
+      [AC_MSG_RESULT([no])
+      groff_no_x=yes])
 
-     LIBS="$LIBS -lXmu"
-     AC_MSG_CHECKING([for Xmu library and header files])
-     AC_LINK_IFELSE([
-        AC_LANG_PROGRAM([[
+    LIBS="$LIBS -lXmu"
+    AC_MSG_CHECKING([for Xmu library and header files])
+    AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([[
 
 #include <X11/Intrinsic.h>
 #include <X11/Xmu/Converters.h>
 
-        ]],
-        [])
-       ],
-       [AC_MSG_RESULT([yes])],
-       [AC_MSG_RESULT([no])
-       groff_no_x="yes"])
+        ]],
+        [])
+      ],
+      [AC_MSG_RESULT([yes])],
+      [AC_MSG_RESULT([no])
+      groff_no_x=yes])
 
-     CFLAGS=$OLDCFLAGS
-     LDFLAGS=$OLDLDFLAGS
-     LIBS=$OLDLIBS
-   fi
+    CFLAGS=$OLDCFLAGS
+    LDFLAGS=$OLDLDFLAGS
+    LIBS=$OLDLIBS
+  fi
 
-  if ! test "$groff_no_x" = yes; then
+  if ! test "$groff_no_x" = yes
+  then
     XDEVDIRS="font/devX75 font/devX75-12 font/devX100 font/devX100-12"
     XPROGDIRS="src/devices/xditview src/utils/xtotroff"
     XLIBDIRS="src/libs/libxutil"
   fi
 
-   AC_SUBST([XDEVDIRS])
-   AC_SUBST([XPROGDIRS])
-   AC_SUBST([XLIBDIRS])])
+  AC_SUBST([XDEVDIRS])
+  AC_SUBST([XPROGDIRS])
+  AC_SUBST([XLIBDIRS])
+])
 
 
 # Set up the '--with-appresdir' command-line option.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]