Kaydet (Commit) f20af6b8 authored tarafından Peter Foley's avatar Peter Foley Kaydeden (comit) Thorsten Behrens

use md5 for scp2 stamp

Conflicts:
	Makefile.top

Change-Id: Ib416077c6a866c265f7346df8a86ac7bc254c37d
üst 06535009
...@@ -192,7 +192,6 @@ endif ...@@ -192,7 +192,6 @@ endif
$(BUILDDIR)/config.status \ $(BUILDDIR)/config.status \
$(BUILDDIR)/config_build.mk \ $(BUILDDIR)/config_build.mk \
$(BUILDDIR)/config_host.mk \ $(BUILDDIR)/config_host.mk \
$(BUILDDIR)/config_host.mk.last \
$(BUILDDIR)/config_host.mk.stamp \ $(BUILDDIR)/config_host.mk.stamp \
$(BUILDDIR)/config_host/*.h \ $(BUILDDIR)/config_host/*.h \
$(BUILDDIR)/configure \ $(BUILDDIR)/configure \
......
...@@ -11821,8 +11821,7 @@ if test "$MD5SUM" = "md5"; then ...@@ -11821,8 +11821,7 @@ if test "$MD5SUM" = "md5"; then
fi fi
if test -z "$MD5SUM"; then if test -z "$MD5SUM"; then
AC_MSG_WARN([no md5sum: found!]) AC_MSG_ERROR([no md5sum: found!])
add_warning "no md5sum: found!"
fi fi
fi fi
...@@ -12403,11 +12402,9 @@ fi ...@@ -12403,11 +12402,9 @@ fi
AC_SUBST(LO_PATH) 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 if test -f config_host.mk; then
mv -f config_host.mk config_host.mk.last config_md5=`$MD5SUM config_host.mk | sed "s/ .*//"`
else
echo > config_host.mk.last
fi fi
AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk instsetoo_native/util/openoffice.lst]) AC_CONFIG_FILES([config_host.mk Makefile lo.xcent solenv/inc/minor.mk instsetoo_native/util/openoffice.lst])
...@@ -12422,7 +12419,7 @@ AC_OUTPUT ...@@ -12422,7 +12419,7 @@ AC_OUTPUT
# touch the config timestamp file # touch the config timestamp file
if test ! -f config_host.mk.stamp; then if test ! -f config_host.mk.stamp; then
echo > config_host.mk.stamp 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" echo "Configuration unchanged - avoiding scp2 stamp update"
else else
echo > config_host.mk.stamp echo > config_host.mk.stamp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment