[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - configure.in desktop/scripts

[David Tardon]

 configure.in                  |    3 ++-
 desktop/scripts/soffice.sh.in |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 23e6f8b208bce0412e8aa0cb46a29f0395eb8317
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 11 17:32:02 2012 +0100

    bah, i forgot *export*
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/configure.in b/configure.in
index 016e468..824de63 100644
--- a/configure.in
+++ b/configure.in
@@ -3890,7 +3890,7 @@ if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
     # IBMs JDK needs this...
     JITC_PROCESSOR_TYPE=6
     export JITC_PROCESSOR_TYPE
-    JITC_PROCESSOR_TYPE_EXPORT="JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE"
+    JITC_PROCESSOR_TYPE_EXPORT="export JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE"
 fi
 AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
 
commit 38a32dfd832dcd47af2457567c18a6e357bb578a
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jan 11 16:54:35 2012 +0100

    we need a var. assignment here, not a value
    
    Signed-off-by: David Tardon <dtardon at redhat.com>

diff --git a/configure.in b/configure.in
index 40b20eb..016e468 100644
--- a/configure.in
+++ b/configure.in
@@ -3890,8 +3890,9 @@ if test "$_os" = "Linux" && test "$host_cpu" = "powerpc"; then
     # IBMs JDK needs this...
     JITC_PROCESSOR_TYPE=6
     export JITC_PROCESSOR_TYPE
+    JITC_PROCESSOR_TYPE_EXPORT="JITC_PROCESSOR_TYPE=$JITC_PROCESSOR_TYPE"
 fi
-AC_SUBST([JITC_PROCESSOR_TYPE])
+AC_SUBST([JITC_PROCESSOR_TYPE_EXPORT])
 
 if test $_os = "WINNT"; then
     WITH_VC_REDIST="TRUE"
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index defd7b2..2014ab9 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -45,7 +45,7 @@ export SAL_ENABLE_FILE_LOCKING
 # uncomment line below if you encounter problems starting soffice on your system
 # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
 
- at JITC_PROCESSOR_TYPE@
+ at JITC_PROCESSOR_TYPE_EXPORT@
 
 # resolve installation directory
 sd_cwd=`pwd`