applied_patches/0227-build-prebuilt-stax.diff

   1 --- configure.in.old    2008-08-22 12:07:03.000000000 +0200
   2 +++ configure.in        2008-08-22 17:34:05.000000000 +0200
   3 @@ -3387,6 +3387,19 @@ else
   4  fi
   5
   6  dnl ===================================================================
   7 +dnl Check for building stax
   8 +dnl ===================================================================
   9 +AC_MSG_CHECKING([whether to build the stax])
  10 +if test -f "external/StAX/jsr173_1.0_api.jar"; then
  11 +   BUILD_STAX=NO
  12 +   AC_MSG_RESULT([no, will use the prebuilt external/StAX/jsr173_1.0_api.jar])
  13 +else
  14 +   BUILD_STAX=YES
  15 +   AC_MSG_RESULT([yes])
  16 +fi
  17 +AC_SUBST(BUILD_STAX)
  18 +
  19 +dnl ===================================================================
  20  dnl Check for building ODK
  21  dnl ===================================================================
  22  AC_MSG_CHECKING([whether to build the ODK])
  23 --- set_soenv.in.old    2008-08-22 12:07:03.000000000 +0200
  24 +++ set_soenv.in        2008-08-22 17:35:07.000000000 +0200
  25 @@ -2070,6 +2070,7 @@ ToFile( "ENABLE_AGG",        "@ENABLE_AG
  26  ToFile( "SYSTEM_AGG",       "@SYSTEM_AGG@",       "e" );
  27  ToFile( "AGG_VERSION",      "@AGG_VERSION@",      "e" );
  28  ToFile( "BUILD_DMAKE",       "@BUILD_DMAKE@",      "e" );
  29 +ToFile( "BUILD_STAX",        "@BUILD_STAX@",       "e" );
  30  ToFile( "BUILD_UNOWINREG",   "@BUILD_UNOWINREG@",  "e" );
  31  ToFile( "USE_XINERAMA",      "@USE_XINERAMA@",     "e" );
  32  ToFile( "XINERAMA_LINK",     "@XINERAMA_LINK@",    "e" );
  33 --- stax/makefile.mk.old        2008-07-28 13:59:31.000000000 +0200
  34 +++ stax/makefile.mk    2008-08-22 17:40:53.000000000 +0200
  35 @@ -51,6 +51,15 @@ all:
  36         @echo "Therefore the files provided here does not need to be built in addition."
  37  .ENDIF
  38
  39 +EXTERNAL_DIR=$(PRJ)$/..$/external/StAX
  40 +
  41 +.IF "$(BUILD_STAX)" != "YES"
  42 +
  43 +$(OUT)$/class$/jsr173_1.0_api.jar : $(EXTERNAL_DIR)$/jsr173_1.0_api.jar
  44 +       +$(COPY) $< $@
  45 +
  46 +.ELSE                  #  "$(BUILD_STAX)" != "YES"
  47 +
  48  # --- Files --------------------------------------------------------
  49  TARFILE_NAME=stax-api-1.0-2-sources
  50  TARFILE_ROOTDIR=src
  51 @@ -66,6 +75,7 @@ OUT2CLASS=jsr173_1.0_api.jar
  52
  53  OUT2CLASS=jsr173_1.0_api.jar
  54
  55 +.ENDIF                 #  "$(BUILD_STAX)" != "YES"
  56  .ELSE                  # $(SOLAR_JAVA)!= ""
  57  nojava:
  58         @echo "Not building $(PRJNAME) because Java is disabled"