test -e not supported on Solaris

Francois Gouget fgouget at free.fr
Sun Jan 27 01:43:03 CST 2002



   On Solaris, /bin/sh does not support 'test -e' (test is a shell
builtin). So this patch replaces these instances with either -f or -d or
both. Note that configure will have to be regenerated.


Changelog:

 * configure.in,
   documentation/db2html-winehq,
   documentation/make_winehq,
   documentation/winelib-toolkit.sgml,
   tools/winemaker

   'test -e' is not supported on Solaris, replace with '-f' or '-d'



--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
               RFC 2549: ftp://ftp.isi.edu/in-notes/rfc2549.txt
                IP over Avian Carriers with Quality of Service
-------------- next part --------------
Index: configure.in
===================================================================
RCS file: /home/wine/wine/configure.in,v
retrieving revision 1.249
diff -u -r1.249 configure.in
--- configure.in	2002/01/22 18:28:25	1.249
+++ configure.in	2002/01/27 05:26:43
@@ -265,7 +265,7 @@
     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.])
Index: documentation/db2html-winehq
===================================================================
RCS file: /home/wine/wine/documentation/db2html-winehq,v
retrieving revision 1.4
diff -u -r1.4 db2html-winehq
--- documentation/db2html-winehq	2002/01/15 20:24:15	1.4
+++ documentation/db2html-winehq	2002/01/27 05:26:54
@@ -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
Index: documentation/make_winehq
===================================================================
RCS file: /home/wine/wine/documentation/make_winehq,v
retrieving revision 1.4
diff -u -r1.4 make_winehq
--- documentation/make_winehq	2001/11/25 00:51:36	1.4
+++ documentation/make_winehq	2002/01/27 05:26:54
@@ -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
Index: documentation/winelib-toolkit.sgml
===================================================================
RCS file: /home/wine/wine/documentation/winelib-toolkit.sgml,v
retrieving revision 1.1
diff -u -r1.1 winelib-toolkit.sgml
--- documentation/winelib-toolkit.sgml	2001/01/24 19:36:24	1.1
+++ documentation/winelib-toolkit.sgml	2002/01/27 05:26:55
@@ -392,7 +392,7 @@
 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 
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.36
diff -u -r1.36 winemaker
--- tools/winemaker	2001/10/14 16:06:18	1.36
+++ tools/winemaker	2002/01/27 05:27:09
@@ -1951,7 +1951,7 @@
       }
       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";
     }


More information about the wine-patches mailing list