Skip to content
Snippets Groups Projects
Commit 83c28091 authored by Benedikt Meurer's avatar Benedikt Meurer
Browse files

grep -q does not work with Solaris grep, fixed it.

(Old svn revision: 11270)
parent 11d19052
No related merge requests found
......@@ -23,7 +23,7 @@ AC_DEFUN([BM_LIBX11],
;;
esac
done
if ! echo $LIBX11_LIBS | grep -q -- '-lX11'; then
if ! echo $LIBX11_LIBS | grep -- '-lX11' > /dev/null; then
LIBX11_LIBS="$LIBX11_LIBS -lX11"
fi
], [], [$X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS])
......@@ -52,7 +52,7 @@ AC_DEFUN([BM_LIBSM],
LIBSM_CFLAGS="$LIBX11_CFLAGS"
LIBSM_LDFLAGS="$LIBX11_LDFLAGS"
LIBSM_LIBS="$LIBX11_LIBS"
if ! echo $LIBSM_LIBS | grep -q -- '-lSM'; then
if ! echo $LIBSM_LIBS | grep -- '-lSM' > /dev/null; then
LIBSM_LIBS="$LIBSM_LIBS -lSM -lICE"
fi
], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lICE])
......@@ -73,7 +73,7 @@ AC_DEFUN([BM_LIBXPM],
LIBXPM_CFLAGS="$LIBX11_CFLAGS"
LIBXPM_LDFLAGS="$LIBX11_LDFLAGS"
LIBXPM_LIBS="$LIBX11_LIBS"
if ! echo $LIBXPM_LIBS | grep -q -- '-lXpm'; then
if ! echo $LIBXPM_LIBS | grep -- '-lXpm' > /dev/null; then
LIBXPM_LIBS="$LIBXPM_LIBS -lXpm"
fi
], [], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lXpm])
......@@ -107,10 +107,10 @@ AC_HELP_STRING([--disable-xinerama], [disable xinerama extension [default]]),
LIBXINERAMA_CFLAGS="$LIBX11_CFLAGS"
LIBXINERAMA_LDFLAGS="$LIBX11_LDFLAGS"
LIBXINERAMA_LIBS="$LIBX11_LIBS"
if ! echo $LIBXINERAMA_LIBS | grep -q -- '-lXinerama'; then
if ! echo $LIBXINERAMA_LIBS | grep -- '-lXinerama' > /dev/null; then
LIBXINERAMA_LIBS="$LIBXINERAMA_LIBS -lXinerama"
fi
if ! echo $LIBXINERAMA_LIBS | grep -q -- '-lXext'; then
if ! echo $LIBXINERAMA_LIBS | grep -- '-lXext' > /dev/null; then
LIBXINERAMA_LIBS="$LIBXINERAMA_LIBS -lXext"
fi
],[], [$LIBX11_CFLAGS $LIBX11_LDFLAGS $LIBX11_LIBS -lXext])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment