Author: jim Date: Wed Oct 5 17:07:36 2016 New Revision: 1763469 URL: http://svn.apache.org/viewvc?rev=1763469&view=rev Log: To better allow for changes between OSX (esp related to openssl, but useful otherwise), tuck away the actual Darwin rev number.
Modified: openoffice/trunk/main/configure.ac Modified: openoffice/trunk/main/configure.ac URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1763469&r1=1763468&r2=1763469&view=diff ============================================================================== --- openoffice/trunk/main/configure.ac (original) +++ openoffice/trunk/main/configure.ac Wed Oct 5 17:07:36 2016 @@ -1150,6 +1150,10 @@ case "$build_os" in if test ! -n "$CXX"; then CXX="`xcrun -f clang++` -arch x86_64 -std=c++11" fi + # Don't use OSVERSION until we know no conflicts result from it + _darwin_version="`uname -r | $AWK -F . '{ print $1 }'`" + _osx_version="10.`expr $_darwin_version - 4`" + AC_MSG_NOTICE([Detected Darwin version: $_darwin_version ($_osx_version)]) ;; os2*) test_x=no