Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
xfwm4
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xfce
xfwm4
Commits
83c28091
Commit
83c28091
authored
21 years ago
by
Benedikt Meurer
Browse files
Options
Downloads
Patches
Plain Diff
grep -q does not work with Solaris grep, fixed it.
(Old svn revision: 11270)
parent
11d19052
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
m4/X11.m4
+5
-5
5 additions, 5 deletions
m4/X11.m4
with
5 additions
and
5 deletions
m4/X11.m4
+
5
−
5
View file @
83c28091
...
...
@@ -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])
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment