* Scan for wget and use the full path in fetchurl.sh.

* Use nix-hash (not md5sum) in fetchurl.sh.
This commit is contained in:
Eelco Dolstra 2003-08-06 09:35:05 +00:00
parent 236eb59293
commit d551062ec4
3 changed files with 5 additions and 2 deletions

View file

@ -11,6 +11,8 @@ AC_PROG_CC
AC_PROG_CXX AC_PROG_CXX
AC_PROG_RANLIB AC_PROG_RANLIB
AC_PATH_PROG(wget, wget)
AC_CHECK_LIB(pthread, pthread_mutex_init) AC_CHECK_LIB(pthread, pthread_mutex_init)
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])

View file

@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
echo "downloading $url into $out..." echo "downloading $url into $out..."
wget "$url" -O "$out" || exit 1 @wget@ "$url" -O "$out" || exit 1
actual=$(md5sum -b $out | cut -c1-32) actual=$(@bindir@/nix-hash --flat $out)
if ! test "$actual" == "$md5"; then if ! test "$actual" == "$md5"; then
echo "hash is $actual, expected $md5" echo "hash is $actual, expected $md5"
exit 1 exit 1

View file

@ -4,5 +4,6 @@
-e s^@bindir\@^$(bindir)^g \ -e s^@bindir\@^$(bindir)^g \
-e s^@sysconfdir\@^$(sysconfdir)^g \ -e s^@sysconfdir\@^$(sysconfdir)^g \
-e s^@localstatedir\@^$(localstatedir)^g \ -e s^@localstatedir\@^$(localstatedir)^g \
-e s^@wget\@^$(wget)^g \
< $< > $@ || rm $@ < $< > $@ || rm $@
chmod +x $@ chmod +x $@