From 42dcd97e4cf767284a90e252cc2bc2e4facaffe5 Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@free.fr>
Date: Tue, 29 Jan 2002 17:52:28 +0000
Subject: [PATCH] 'test -e' is not supported on Solaris, replace with '-f' or
 '-d'.

---
 configure                          | 2 +-
 configure.in                       | 2 +-
 documentation/db2html-winehq       | 4 ++--
 documentation/make_winehq          | 2 +-
 documentation/winelib-toolkit.sgml | 2 +-
 tools/winemaker                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index ec7c41207a..ed725bb761 100755
--- a/configure
+++ b/configure
@@ -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; }
diff --git a/configure.in b/configure.in
index b8ee0f4101..761b96fcff 100644
--- a/configure.in
+++ b/configure.in
@@ -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.])
diff --git a/documentation/db2html-winehq b/documentation/db2html-winehq
index fb9d32ce35..d810e6934a 100755
--- a/documentation/db2html-winehq
+++ b/documentation/db2html-winehq
@@ -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
diff --git a/documentation/make_winehq b/documentation/make_winehq
index c2bb276c79..67711e93f5 100755
--- a/documentation/make_winehq
+++ b/documentation/make_winehq
@@ -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
diff --git a/documentation/winelib-toolkit.sgml b/documentation/winelib-toolkit.sgml
index b09c0362bd..952bb97464 100644
--- a/documentation/winelib-toolkit.sgml
+++ b/documentation/winelib-toolkit.sgml
@@ -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 
diff --git a/tools/winemaker b/tools/winemaker
index 7b35e7d465..9112f022a4 100755
--- a/tools/winemaker
+++ b/tools/winemaker
@@ -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";
     }