SPECS: openoffice.org.spec - update from AC-branch

[glen]

Author: glen                         Date: Sun Mar 18 15:24:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update from AC-branch

---- Files affected:
SPECS:
   openoffice.org.spec (1.742 -> 1.743) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.742 SPECS/openoffice.org.spec:1.743
--- SPECS/openoffice.org.spec:1.742	Sun Mar 18 16:18:28 2007
+++ SPECS/openoffice.org.spec	Sun Mar 18 16:24:17 2007
@@ -2090,6 +2090,10 @@
 	exit 1
 fi
 
+export CC="%{__cc}"
+export CXX="%{__cxx}"
+export CPP="%{__cpp}"
+
 %{__aclocal}
 %{__autoconf}
 
@@ -2099,8 +2103,6 @@
 DISTRO="PLD"
 %endif
 
-export CC="%{__cc}"
-export CXX="%{__cxx}"
 export ENVCFLAGS="%{rpmcflags}"
 # disable STLport 5.1 containers extension, doesn't work with map indexed by enum
 export ENVCFLAGSCXX="%{rpmcflags} -fpermissive -D_STLP_NO_CONTAINERS_EXTENSION"
@@ -2254,6 +2256,9 @@
 
 # main build
 %configure \
+	CC="$CC" \
+	CXX="$CXX" \
+	CPP="$CPP" \
 	$CONFOPTS
 
 # this limits processing some files but doesn't limit parallel build
@@ -3902,6 +3907,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.743  2007/03/18 15:24:17  glen
+- update from AC-branch
+
 Revision 1.742  2007/03/18 15:18:28  glen
 - package icons
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.742&r2=1.743&f=u