[SM-Commit] PERFORCE change 79760 by Eric Sandall for review
Perforce Review Daemon
p4review at smee.org
Wed May 24 16:15:03 EDT 2006
Change 79760 by eric_sandall at sandalle-moby on 2006/05/24 21:13:01
* Bring mine and Robin's fixes into test
Affected files ...
... //sgl/grimoires/test/x11-toolkits/xaw3d/BUILD#3 integrate
... //sgl/grimoires/test/x11-toolkits/xaw3d/DEPENDS#2 integrate
... //sgl/grimoires/test/x11-toolkits/xaw3d/HISTORY#6 integrate
Differences ...
==== //sgl/grimoires/test/x11-toolkits/xaw3d/BUILD#3 (xtext) ====
@@ -10,8 +10,8 @@
xmkmf &&
make Makefiles &&
-if spell_ok xorg-server; then
- sedit "s:/X11R6::g" Makefile
+if test "$(get_spell_provider $SPELL X11-LIBS)" = xorg-server; then
+sedit "s:/X11R6::g" Makefile
fi &&
make
==== //sgl/grimoires/test/x11-toolkits/xaw3d/DEPENDS#2 (xtext) ====
@@ -1,2 +1,7 @@
depends X11-LIBS &&
-depends perl
+depends perl &&
+
+if [ "$(get_spell_provider $SPELL X11-LIBS)" == "xorg-server" ]; then
+ depends imake &&
+ depends libxp
+fi
==== //sgl/grimoires/test/x11-toolkits/xaw3d/HISTORY#6 (text) ====
@@ -1,3 +1,10 @@
+2006-05-24 Eric Sandall <eric at sandall.us>
+ * DEPENDS: If xorg-server is providing X11-LIBS, depend on imake (for
+ xmkmf command) and libxp
+
+2006-05-07 Robin Cook <rcook at wyrms.net>
+ * BUILD: changed to match on X11-LIBS provider
+
2006-05-06 Robin Cook <rcook at wyrms.net>
* BUILD: added check and sedit for xorg-modular
More information about the SM-Commit
mailing list