Author: hdu
Date: Tue Jun 3 13:41:05 2014
New Revision: 1599542
URL: http://svn.apache.org/r1599542
Log:
#125003# use gtest tarball provided configure script
on the RHEL5 baseline using autoconf for building gtest results in problems
because the platform only provides autoconf 2.59 while the provided aclocal.m4
requires autoconf 2.68 or newer. Fortunately the gtest tarball also provides
a perfectly fine configure script and the autoconf step is not needed.
Modified:
openoffice/trunk/ext_libraries/gtest/makefile.mk
Modified: openoffice/trunk/ext_libraries/gtest/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/makefile.mk?rev=1599542&r1=1599541&r2=1599542&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/gtest/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/gtest/makefile.mk Tue Jun 3 13:41:05 2014
@@ -67,7 +67,7 @@ BUILD_FLAGS+= -f ../../../../win/Makefil
.ELSE
CONFIGURE_DIR=
-CONFIGURE_ACTION=autoconf && .$/configure
+CONFIGURE_ACTION=.$/configure
.IF "$(OS)"=="MACOSX"
CONFIGURE_FLAGS='CXX=$(CXX)'
