[Libreoffice-commits] .: configure.in
Thorsten Behrens
thorsten at kemper.freedesktop.org
Wed Jan 12 11:59:05 PST 2011
configure.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit e8f1b63300375bc624780a539ec44e077f7f653a
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Jan 12 20:42:38 2011 +0100
Move CC/CXX saving to a safe place
AC_CHECK_LIB, AC_CHECK_HEADER etc tend to touch CC, so better
move saving of that var to an earlier part of configure
diff --git a/configure.in b/configure.in
index 3200acc..c4982cb 100755
--- a/configure.in
+++ b/configure.in
@@ -1313,6 +1313,9 @@ if test "$EUID" -eq "0" -a "z`uname -o 2>/dev/null`" = "zCygwin" ; then
AC_MSG_ERROR([You must build LibreOffice as a normal user - not using an administrative account])
fi
+save_CC=$CC
+save_CXX=$CXX
+
AC_PROG_EGREP
AC_PROG_AWK
AC_PATH_PROG( AWK, $AWK)
@@ -1877,9 +1880,6 @@ fi
AC_MSG_RESULT($GCC_HOME)
AC_SUBST(GCC_HOME)
-save_CC=$CC
-save_CXX=$CXX
-
if test "$GCC_HOME_SET" = "true" ; then
if test -z "$CC"; then
CC="$GCC_HOME/bin/gcc"
More information about the Libreoffice-commits
mailing list