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

   1 --- psprint/source/helper/helper.cxx.orig       2003-08-08 08:41:05.000000000 -0700
   2 +++ psprint/source/helper/helper.cxx    2003-08-08 08:43:33.000000000 -0700
   3 @@ -72,7 +72,9 @@
   4  #include <tools/config.hxx>
   5  #include <rtl/bootstrap.hxx>
   6  #include <sal/config.h>
   7 +#ifdef SOLAR_JAVA
   8  #include "jvmaccess/javainfo.hxx"
   9 +#endif // SOLAR_JAVA
  10
  11  using namespace rtl;
  12
  13 @@ -263,6 +265,7 @@
  14              }
  15          }
  16
  17 +#ifdef SOLAR_JAVA
  18          // if no javarc (e.g. in setup) exists or it failed try the UDK method
  19          if( ! aJREpath.getLength() )
  20          {
  21 @@ -299,6 +302,7 @@
  22                  }
  23              }
  24          }
  25 +#endif // SOLAR_JAVA
  26
  27          if( aJREpath.getLength() )
  28          {
  29 --- psprint-old/util/makefile.mk        2003-10-13 03:19:55.000000000 +0200
  30 +++ psprint/util/makefile.mk    2003-10-13 03:17:08.000000000 +0200
  31 @@ -95,6 +95,5 @@
  32
  33  SHL1STDLIBS=$(UNOTOOLSLIB)             \
  34                         $(TOOLSLIB)             \
  35 -            $(JVMACCESSLIB)            \
  36                         $(SALLIB)                       \
  37                         -lX11
  38
  39 .IF "$(FONTCONFIG_FONTS)" == "YES"
  40  SHL1STDLIBS+=`pkg-config --libs fontconfig`
  41  .ENDIF
  42 +.IF "$(SOLAR_JAVA)" != ""
  43 +SHL1STDLIBS+=$(JVMACCESSLIB)
  44 +.ENDIF
  45
  46  SHL1DEF=       $(MISC)$/$(SHL1TARGET).def
  47