Makefile.in | 1 -
configure.ac | 11 ++++-------
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit f20af6b8885afa89c276ecbe22754daca63393e7
Author: Peter Foley <pefol...@verizon.net>
Date: Mon Dec 3 19:04:20 2012 -0500
use md5 for scp2 stamp
Conflicts:
Makefile.top
Change-Id: Ib416077c6a866c265f7346df8a86ac7bc254c37d
diff --git a/Makefile.in b/Makefile.in
index 4d7f120..2c6ef73 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -192,7 +192,6 @@ endif
$(BUILDDIR)/config.status \
$(BUILDDIR)/config_build.mk \
$(BUILDDIR)/config_host.mk \
- $(BUILDDIR)/config_host.mk.last \
$(BUILDDIR)/config_host.mk.stamp \
$(BUILDDIR)/config_host/*.h \
$(BUILDDIR)/configure \
diff --git a/configure.ac b/configure.ac
index 98aafcb..da60c50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11821,8 +11821,7 @@ if test "$MD5SUM" = "md5"; then
fi
if test -z "$MD5SUM"; then
- AC_MSG_WARN([no md5sum: found!])
- add_warning "no md5sum: found!"
+ AC_MSG_ERROR([no md5sum: found!])
fi
fi
@@ -12403,11 +12402,9 @@ fi
AC_SUBST(LO_PATH)
-# Generate a configuration timestamp we can use for deps
+# Generate a configuration md5 we can use for deps
if test -f config_host.mk; then
- mv -f config_host.mk config_host.mk.last
-else
- echo > config_host.mk.last
+ config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
fi
AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk
instsetoo_native/util/openoffice.lst])
@@ -12422,7 +12419,7 @@ AC_OUTPUT
# touch the config timestamp file
if test ! -f config_host.mk.stamp; then
echo > config_host.mk.stamp
-elif diff config_host.mk config_host.mk.last >/dev/null 2>&1; then
+elif test "$config_md5" = `$MD5SUM config_host.mk | sed "s/ .*//"`; then
echo "Configuration unchanged - avoiding scp2 stamp update"
else
echo > config_host.mk.stamp
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
