[Libreoffice-commits] .: 2 commits - set_soenv.in

[Robert Nagy]

 set_soenv.in |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit fc6ba992ddc4e724ed601d0f0917296ad9e7db79
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 15:39:54 2010 +0100

    pick up system jpeg on openbsd

diff --git a/set_soenv.in b/set_soenv.in
index 041a4b7..7798b2c 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1438,12 +1438,14 @@ if ($platform =~ m/linux/)
 }
 
 
-   	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31".
-                     $I.'$JAVA_HOME'.$INCLUDE;
+	$SOLARINC      .= $I.'$SOLARENV'.$INC.$ds."Xp31";
 
+	# pickup system jpeg over java jpeg on OpenBSD
 	if ($platform =~ m/openbsd/)
 	{  $SOLARINC  .= $I.$USR_LOCAL.$INCLUDE;
 	}
+	{  $SOLARINC  .= $I.'$JAVA_HOME'.$INCLUDE;
+	}
 
 	#include system dependent Java include directory
 	if (!($JDK eq "gcj"))
commit 38beb842a8cfa4ddba355fa78b908bc3399b7f73
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 01:08:11 2010 +0100

    OpenBSD needs /usr/local/lib in SOLARLIB

diff --git a/set_soenv.in b/set_soenv.in
index d194a82..041a4b7 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1369,12 +1369,16 @@ elsif ($platform =~ m/linux|netbsd|osf1|aix|freebsd|openbsd/)
 {  $SOLARLIB          = $L.$par_dir.$LIB.
                         $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
                         $L.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
-                        $L.'$JAVA_HOME'.$LIB64.
+                        $L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB;
+   if ($platform =~ m/openbsd/) {
+      $SOLARLIB       .= $L.$USR_LOCAL.$LIB;
+   }
+   $SOLARLIB         .= $L.'$JAVA_HOME'.$LIB64.
                         $L.$JRELIBDIR.
                         $L.$JRETOOLKITDIR.
                         $L.$JRETHREADDIR.
                         $L_STLPORT_LIB;
+
    if ( $XLIB ne "/usr/lib" && $XLIB ne "/usr/lib64" ) {
       $SOLARLIB       .= $L.$XLIB;
    }