Skip to content

Commit

Permalink
Remove bashism (thanks to Prof. Ripley)
Browse files Browse the repository at this point in the history
  • Loading branch information
dmurdoch committed Jan 6, 2025
1 parent 53a5893 commit c7664d5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -4962,7 +4962,7 @@ printf "%s\n" "no" >&6; }
fi


if test "x$HAVE_PKG_CONFIG" = "xyes" -a "x`pkg-config freetype2 --cflags`" != "x"; then
if test "x$HAVE_PKG_CONFIG" = "xyes" && test "x`pkg-config freetype2 --cflags`" != "x"; then
CPPFLAGS="${CPPFLAGS} -DHAVE_FREETYPE -Iext/ftgl `pkg-config freetype2 --cflags`"
LIBS="${LIBS} `pkg-config freetype2 --static --libs`"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: using Freetype and FTGL" >&5
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ if test "x$enable_opengl" != "xno"; then
fi
## new pkg-config bit
AC_CHECK_PROG([HAVE_PKG_CONFIG],[pkg-config],[yes],[no])
if test "x$HAVE_PKG_CONFIG" = "xyes" -a "x`pkg-config freetype2 --cflags`" != "x"; then
if test "x$HAVE_PKG_CONFIG" = "xyes" && test "x`pkg-config freetype2 --cflags`" != "x"; then
CPPFLAGS="${CPPFLAGS} -DHAVE_FREETYPE -Iext/ftgl `pkg-config freetype2 --cflags`"
LIBS="${LIBS} `pkg-config freetype2 --static --libs`"
AC_MSG_NOTICE([using Freetype and FTGL])
Expand Down

0 comments on commit c7664d5

Please sign in to comment.