mirror of
https://github.com/reactos/wine.git
synced 2024-11-24 12:20:07 +00:00
'test -e' is not supported on Solaris, replace with '-f' or '-d'.
This commit is contained in:
parent
815997ffe0
commit
42dcd97e4c
2
configure
vendored
2
configure
vendored
@ -3861,7 +3861,7 @@ done
|
||||
|
||||
if test $OPENGL = "yes" -o $OPENGL = "normal"
|
||||
then
|
||||
if test -e /usr/X11R6/lib/libGL.a -a ! -e /usr/X11R6/lib/libGL.so
|
||||
if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so
|
||||
then
|
||||
{ echo "configure: error: /usr/X11R6/lib/libGL.a is present on your system.
|
||||
This prevents linking to OpenGL. Delete the file and restart configure." 1>&2; exit 1; }
|
||||
|
@ -265,7 +265,7 @@ then
|
||||
dnl Check for the presence of OpenGL
|
||||
if test $OPENGL = "yes" -o $OPENGL = "normal"
|
||||
then
|
||||
if test -e /usr/X11R6/lib/libGL.a -a ! -e /usr/X11R6/lib/libGL.so
|
||||
if test -f /usr/X11R6/lib/libGL.a -a ! -f /usr/X11R6/lib/libGL.so
|
||||
then
|
||||
AC_MSG_ERROR([/usr/X11R6/lib/libGL.a is present on your system.
|
||||
This prevents linking to OpenGL. Delete the file and restart configure.])
|
||||
|
@ -12,12 +12,12 @@
|
||||
## $LINUXDIST holds the name of the distribution
|
||||
## $JADETAG adds "/#html" to the stylesheet-specification in the Jade
|
||||
## command line (see comments below), if necessary for that dist.
|
||||
if [ -e /etc/debian_version ]; then
|
||||
if [ -f /etc/debian_version ]; then
|
||||
LINUXDIST="Debian"
|
||||
JADETAG=\#html
|
||||
fi
|
||||
|
||||
if [ -e /etc/redhat_release ]; then
|
||||
if [ -f /etc/redhat_release ]; then
|
||||
LINUXDIST="Redhat"
|
||||
JADETAG=
|
||||
fi
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
WWWDIR=www.winehq.com
|
||||
## Want to put this into a sub-directory for easier maintenance
|
||||
if [ -e "$WWWDIR" ]; then
|
||||
if [ -d "$WWWDIR" -o -f "$WWWDIR" ]; then
|
||||
rm -rf "$WWWDIR.old"
|
||||
mv "$WWWDIR" "$WWWDIR".old
|
||||
fi
|
||||
|
@ -392,7 +392,7 @@ $(hello_SPEC_SRCS:.spec=.spec.c): $(hello_SPEC_SRCS:.spec) $(hello_SPEC_SRCS:.sp
|
||||
hello.so: $(hello_SPEC_SRCS:.spec=.spec.o) $(hello_OBJS) $(hello_DEP
|
||||
ENDS)
|
||||
$(LDSHARED) $(LDDLLFLAGS) -o $@ $(hello_OBJS) $(hello_SPEC_SRCS:.spec=.spec.o) $(hello_LIBRARY_PATH) $(hello_LIBRARIES:%=-l%) $(DLL_LINK) $(LIBS)
|
||||
test -e hello || $(LN_S) $(WINE) hello
|
||||
test -f hello || $(LN_S) $(WINE) hello
|
||||
</programlisting>
|
||||
<para>
|
||||
Then come additional directives to link the executables and
|
||||
|
@ -1951,7 +1951,7 @@ sub generate_project_files
|
||||
}
|
||||
print FILEO " \$(LDDLLFLAGS) -o \$\@ \$(${canon}_OBJS) \$(${canon}_SPEC_SRCS:.spec=.spec.o) \$(${canon}_LIBRARY_PATH) \$(${canon}_LIBRARIES:%=-l%) \$(DLL_LINK) \$(LIBS)\n";
|
||||
if (@$target[$T_TYPE] ne $TT_DLL) {
|
||||
print FILEO "\ttest -e @$target[$T_NAME] || \$(LN_S) \$(WINE) @$target[$T_NAME]\n";
|
||||
print FILEO "\ttest -f @$target[$T_NAME] || \$(LN_S) \$(WINE) @$target[$T_NAME]\n";
|
||||
}
|
||||
print FILEO "\n\n";
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user