Author: damjan
Date: Wed Mar 9 03:48:18 2016
New Revision: 1734186
URL: http://svn.apache.org/viewvc?rev=1734186&view=rev
Log:
Merge commits from branches/gbuild:
r1409541: gnumake4: #i117350# configure.in: s/MINGSTRIP/MINGWSTRIP/
r1409543: gnumake4: configure.in: remove checks for obsolete Solaris 2.[67]
r1409544: gnumake4: configure.in: require Info-ZIP 3.0
Had to apply changes to configure.ac instead.
Build updates by: me
Modified:
openoffice/branches/gbuild-reintegration/ (props changed)
openoffice/branches/gbuild-reintegration/main/configure.ac
Propchange: openoffice/branches/gbuild-reintegration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 9 03:48:18 2016
@@ -1,4 +1,4 @@
-/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409526,1409529-1409530,1409538-1409540
+/incubator/ooo/branches/gbuild:1409313-1409495,1409499-1409510,1409513,1409515,1409523,1409526,1409529-1409530,1409538-1409541,1409543-1409544
/openoffice/branches/AOO400:1503684
/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666
/openoffice/branches/alg_writerframes:1556289-1579189
Modified: openoffice/branches/gbuild-reintegration/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/branches/gbuild-reintegration/main/configure.ac?rev=1734186&r1=1734185&r2=1734186&view=diff
==============================================================================
--- openoffice/branches/gbuild-reintegration/main/configure.ac (original)
+++ openoffice/branches/gbuild-reintegration/main/configure.ac Wed Mar 9
03:48:18 2016
@@ -2596,107 +2596,6 @@ AC_LANG_POP([C++])
EXCEPTIONS="$exceptions_type"
AC_SUBST(EXCEPTIONS)
-dnl **************************************************************
-dnl Testing for required Solaris and SunStudio compiler patches...
-dnl **************************************************************
-dnl Check whether the OS is SunOS.
-if test "$_os" = "SunOS"; then
- _temp=`showrev -p | $AWK -F" " '{ print $2 }'`
- if test "$_os_release" = "7"; then
- dnl ***************
- dnl patch 106327-06
- dnl ***************
- AC_MSG_CHECKING([for patch 106327-06 or greater])
- _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'`
- _patch="false"
- for i in $_temp
- do
- _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
- if test "$_patch_major" = "106327"; then
- _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
- if test "$_patch_rev" -ge "6"; then
- _patch="found"
- fi
- fi
- done
- if test "$_patch" = "found"; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_WARN([patch 106327-06 not found, please install compiler patch
106327-06 or greater])
- echo "patch 106327-06 not found, please install compiler patch
106327-06 or greater" >> warn
- fi
- dnl ***************
- dnl patch 106950-11
- dnl ***************
- AC_MSG_CHECKING([for patch 106950-11 or greater])
- _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'`
- _patch="false"
- for i in $_temp
- do
- _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
- if test "$_patch_major" = "106950"; then
- _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
- if test "$_patch_rev" -ge "11"; then
- _patch="found"
- fi
- fi
- done
- if test "$_patch" = "found"; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_WARN([patch 106950-11 not found, please install linker patch
106950-11 or greater])
- echo "patch 106950-11 not found, please install linker patch
106950-11 or greater" >> warn
- fi
- else
- if test "$_os_release" = "6"; then
- dnl ***************
- dnl patch 105591-09
- dnl ***************
- AC_MSG_CHECKING([for patch 105591-09 or greater])
- _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'`
- _patch="false"
- for i in $_temp
- do
- _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
- if test "$_patch_major" = "105591"; then
- _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
- if test "$_patch_rev" -ge "9"; then
- _patch="found"
- fi
- fi
- done
- if test "$_patch" = "found"; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_WARN([patch 105591-09 not found, please install compiler
patch 105591-09 or greater])
- echo "patch 105591-09 not found, please install compiler patch
105591-09 or greater" >> warn
- fi
- dnl ***************
- dnl patch 107733-08
- dnl ***************
- AC_MSG_CHECKING([for patch 107733-08 or greater])
- _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'`
- _patch="false"
- for i in $_temp
- do
- _patch_major=`echo $i | $AWK -F"-" '{ print $1 }'`
- if test "$_patch_major" = "107733"; then
- _patch_rev=`echo $i | $AWK -F"-" '{ print $2 }'`
- if test "$_patch_rev" -ge "8"; then
- _patch="found"
- fi
- fi
- done
- if test "$_patch" = "found"; then
- AC_MSG_RESULT([found])
- else
- AC_MSG_WARN([patch 107733-06 not found, please install linker
patch 107733-08 or greater])
- echo "patch 107733-06 not found, please install linker patch
107733-08 or greater" >> warn
- fi
- fi
- fi
-fi
-
dnl ===================================================================
dnl Checks for what the default STL should be
dnl ===================================================================
@@ -3663,7 +3562,7 @@ if test "z$enable_odk" = "z" -o "$enable
AC_MSG_RESULT(yes)
fi
if echo "$WITH_MINGWIN" | $EGREP -q "/"; then
- if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e
s/c++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo
$WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
+ if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e
s/c++/strip/`"; then MINGWSTRIP=false; else MINGWSTRIP=$(basename $(echo
$WITH_MINGWIN | $SED -e s/g++/strip/ | $SED -e s/c++/strip/)); fi
else
AC_CHECK_TOOL(MINGWSTRIP, `echo $WITH_MINGWIN | $SED -e s/g++/strip/
| $SED -e s/c++/strip/`, false)
fi
@@ -5671,6 +5570,9 @@ dnl ====================================
if test -z "$ZIP" -o -z "$UNZIP"; then
AC_MSG_ERROR([Zip/Unzip are required to build, please install or use
--with-zip-home],,)
fi
+if "$ZIP" -FS < /dev/null 2>&1 | $EGREP "no such option: S" > /dev/null; then
+ AC_MSG_ERROR([Zip version 3.0 or newer is required to build, please
install or use --with-zip-home],,)
+fi
dnl ===================================================================
dnl Zip must be a specific type for different build types.
