ooo-build r11373 - in trunk: . bin distro-configs

[strba svn gnome org]

Author: strba
Date: Wed Jan 23 12:58:59 2008
New Revision: 11373
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11373&view=rev

Log:
solaris build bits + making build-ooo and localize-ooo bash scripts

Modified:
   trunk/ChangeLog
   trunk/bin/build-ooo
   trunk/bin/localize-ooo
   trunk/distro-configs/Solaris.conf.in

Modified: trunk/bin/build-ooo
==============================================================================
--- trunk/bin/build-ooo	(original)
+++ trunk/bin/build-ooo	Wed Jan 23 12:58:59 2008
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #
 # See setup for user tweakables.
@@ -17,6 +17,16 @@
     if test -f $GNUTAR -a ! -f $OOBUILDDIR/solenv/bin/tar; then
     	ln -s $GNUTAR $OOBUILDDIR/solenv/bin/tar
     fi
+    if test -d /usr/sfw/lib/pkgconfig; then
+        PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/sfw/lib/pkgconfig"
+	export PKG_CONFIG_PATH
+	CFLAGS="$CFLAGS -I/usr/sfw/include"
+	export CFLAGS
+	CXXFLAGS="$CXXFLAGS -I/usr/sfw/include"
+	export CXXFLAGS
+	CPPFLAGS="$CPPFLAGS -I/usr/sfw/include"
+	export CPPFLAGS
+    fi
 fi
 
 # configure

Modified: trunk/bin/localize-ooo
==============================================================================
--- trunk/bin/localize-ooo	(original)
+++ trunk/bin/localize-ooo	Wed Jan 23 12:58:59 2008
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #
 # See setup for user tweakables.

Modified: trunk/distro-configs/Solaris.conf.in
==============================================================================
--- trunk/distro-configs/Solaris.conf.in	(original)
+++ trunk/distro-configs/Solaris.conf.in	Wed Jan 23 12:58:59 2008
@@ -36,8 +36,6 @@
 --with-ant-home=/opt/apache-ant-1.7.0/
 --with-jdk-home=/usr/jdk/jdk1.5.0_12
 --disable-scsolver
---without-system-neon
---without-system-openssl
 --without-unix-wrapper
 --enable-opengl
 --enable-ogltrans