diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 7dc62a12a..23b4c9f1e 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2004-10-26 Werner Koch + + * autogen.sh: Detect the Debian mingw32 package. + 2004-10-18 Werner Koch * mk-gpg-texi: More fixups to help Debian's install-info. diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 2ff3c2833..9361ac3f7 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -45,32 +45,42 @@ if test "$1" = "--build-w32"; then tmp=`dirname $0` tsdir=`cd "$tmp"; cd ..; pwd` shift - host=i386--mingw32 if [ ! -f $tsdir/scripts/config.guess ]; then echo "$tsdir/scripts/config.guess not found" >&2 exit 1 fi build=`$tsdir/scripts/config.guess` - - if ! mingw32 --version >/dev/null; then - echo "We need at least version 0.3 of MingW32/CPD" >&2 - exit 1 - fi + # See whether we have the Debian cross compiler package or the + # old mingw32/cpd system + if i586-mingw32msvc-gcc --version >/dev/null 2>&1 ; then + host=i586-mingw32msvc + crossbindir=/usr/$host/bin + conf_CC="CC=${host}-gcc" + else + host=i386--mingw32 + if ! mingw32 --version >/dev/null; then + echo "We need at least version 0.3 of MingW32/CPD" >&2 + exit 1 + fi + crossbindir=`mingw32 --install-dir`/bin + # Old autoconf version required us to setup the environment + # with the proper tool names. + CC=`mingw32 --get-path gcc` + CPP=`mingw32 --get-path cpp` + AR=`mingw32 --get-path ar` + RANLIB=`mingw32 --get-path ranlib` + export CC CPP AR RANLIB + conf_CC="" + fi + if [ -f "$tsdir/config.log" ]; then - if ! head $tsdir/config.log | grep i386--mingw32 >/dev/null; then + if ! head $tsdir/config.log | grep "$host" >/dev/null; then echo "Pease run a 'make distclean' first" >&2 exit 1 fi fi - crossbindir=`mingw32 --install-dir`/bin - CC=`mingw32 --get-path gcc` - CPP=`mingw32 --get-path cpp` - AR=`mingw32 --get-path ar` - RANLIB=`mingw32 --get-path ranlib` - export CC CPP AR RANLIB - disable_foo_tests="" if [ -n "$lib_config_files" ]; then for i in $lib_config_files; do @@ -87,7 +97,7 @@ if test "$1" = "--build-w32"; then fi [ $DIE = yes ] && exit 1 - $tsdir/configure --build=${build} --host=${host} \ + $tsdir/configure ${conf_CC} --build=${build} --host=${host} \ ${disable_foo_tests} $* # Ugly hack to overcome a gettext problem. Someone should look into diff --git a/scripts/mail-to-translators b/scripts/mail-to-translators index 10210a73f..23ee4be58 100755 --- a/scripts/mail-to-translators +++ b/scripts/mail-to-translators @@ -6,7 +6,10 @@ SENDMAIL=": /usr/sbin/sendmail" for file in *.po; do + addr=$(head -100 $file | awk '/^# ?Designated-Translator:/ { printf "%s", $0; exit 0}' | sed 's/.*\(<.*>\).*/\1/') + if [ -z "$addr" ]; then addr=$(awk '/Last-Translator:/ { printf "%s", $0; exit 0}' $file | sed 's/.*\(<.*>\).*/\1/') + fi ll=$(basename $file .po) if ! msgfmt -vc $file 2>&1| egrep -q 'fuzzy|untranslated|error'; then @@ -23,6 +26,7 @@ for file in *.po; do ( cat <&1 | head) If you are not able to continue the translation work, I suggest to -pass this message on to another translator and drop me a short note. +pass this message on to another translator and drop a a short note to +gnupg-hackers@gnupg.org . + Thanks, @@ -68,3 +83,4 @@ echo "" ) | $SENDMAIL -oi "$addr" done +