openoffice-setup2-handle-no-solar-java.patch

   1 --- setup2/source/custom/jvmsetup/loader/makefile.mk.orig       2003-09-22 11:08:19.000000000 -0700
   2 +++ setup2/source/custom/jvmsetup/loader/makefile.mk    2003-09-22 13:28:10.000000000 -0700
   3 @@ -72,6 +72,9 @@
   4  .INCLUDE : sv.mk
   5
   6  # --- Files --------------------------------------------------------
   7 +
   8 +.IF "$(SOLAR_JAVA)"!=""
   9 +
  10  CXXFILES=      jvmapp.cxx
  11
  12  OBJFILES=      $(OBJ)$/jvmapp.obj
  13 @@ -128,6 +131,8 @@
  14  UNIXTEXT= \
  15         $(MISC)$/jvmsetup.sh
  16
  17 +.ENDIF "$(SOLAR_JAVA)"!=""
  18 +
  19  .INCLUDE :  target.mk
  20
  21  # ------------------------------------------------------------------
  22 --- setup2/source/custom/jvmsetup/makefile.mk.orig      2003-09-22 11:08:19.000000000 -0700
  23 +++ setup2/source/custom/jvmsetup/makefile.mk   2003-09-22 13:31:00.000000000 -0700
  24 @@ -73,6 +73,8 @@
  25
  26  # --- Files --------------------------------------------------------
  27
  28 +.IF "$(SOLAR_JAVA)"!=""
  29 +
  30  .DIRCACHE=NO
  31
  32  SRCFILES =     jvmdlg.src
  33 @@ -113,6 +115,8 @@
  34
  35  RC_SUBDIRSDEPS=$(SLB)$/jvm.lib
  36
  37 +.ENDIF # "$(SOLAR_JAVA)"!=""
  38 +
  39  # --- Targets --------------------------------------------------------------
  40
  41  .INCLUDE : target.mk
  42 --- setup2/source/ui/main.cxx.orig      2003-09-22 11:08:19.000000000 -0700
  43 +++ setup2/source/ui/main.cxx   2003-09-22 13:27:05.000000000 -0700
  44 @@ -78,7 +78,9 @@
  45  #include <sal/main.h>
  46  #endif
  47
  48 +#ifdef SOLAR_JAVA
  49  #include "jvmaccess/javainfo.hxx"
  50 +#endif
  51
  52  #ifndef _SV_HELP_HXX //autogen
  53  #include <vcl/help.hxx>
  54 @@ -2523,6 +2525,7 @@
  55  static sal_Bool hasJavarc();
  56  void prepareJava(const char * szStartPath)
  57  {
  58 +#ifdef SOLAR_JAVA
  59      if(szStartPath)
  60      {
  61          //check if we are started from an installation. This is done by looking for the classes
  62 @@ -2656,6 +2659,7 @@
  63  #endif
  64           }
  65      }
  66 +#endif // SOLAR_JAVA
  67  }
  68
  69  static sal_Bool hasJavarc()
  70 --- setup2/util/makefile.mk.orig        2003-09-22 11:08:19.000000000 -0700
  71 +++ setup2/util/makefile.mk     2003-09-22 13:27:05.000000000 -0700
  72 @@ -186,7 +186,6 @@
  73                 $(SVTOOLLIB) \
  74                 $(VCLLIB) \
  75                 $(TOOLSLIB) \
  76 -               $(JVMACCESSLIB) \
  77                 $(COMPHELPERLIB) \
  78                 $(CPPUHELPERLIB) \
  79                 $(CPPULIB) \
  80 @@ -195,7 +194,10 @@
  81                 $(SALHELPERLIB) \
  82                 $(UNOTOOLSLIB)  \
  83                 $(SALLIB)
  84 -
  85 +.IF "$(SOLAR_JAVA)"!=""
  86 +APP2STDLIBS+=\
  87 +               $(JVMACCESSLIB)
  88 +.ENDIF
  89
  90  .IF "$(GUI)"=="WNT"
  91  APP2STDLIBS += uwinapi.lib advapi32.lib gdi32.lib shell32.lib ole32.lib uuid.lib version.lib \