diff options
| -rw-r--r-- | scripts/ChangeLog | 4 | ||||
| -rwxr-xr-x | scripts/autogen.sh | 4 | ||||
| -rwxr-xr-x | scripts/mk-w32-dist | 2 | ||||
| -rw-r--r-- | scripts/w32installer.nsi | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index eca136ae4..804455cc3 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2009-09-05 Werner Koch <[email protected]> + + * autogen.sh <--build-w32>: Pass --with-bzip2. + 2009-09-03 Werner Koch <[email protected]> * w32installer.nsi: Set the final OutPath to Doc/. diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 232de1456..0bb23372e 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -51,6 +51,9 @@ if test "$1" = "--build-w32"; then fi build=`$tsdir/scripts/config.guess` + [ -z "$w32root" ] && w32root="$HOME/w32root" + echo "Using $w32root as standard install directory" >&2 + # Locate the cross compiler crossbindir= for host in i586-mingw32msvc i386-mingw32msvc; do @@ -92,6 +95,7 @@ if test "$1" = "--build-w32"; then [ $DIE = yes ] && exit 1 $tsdir/configure ${conf_CC} --build=${build} --host=${host} \ + --with-bzip2=${w32root} \ ${disable_foo_tests} $* exit $? fi diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist index 4b03b9bb7..f3ed20b6a 100755 --- a/scripts/mk-w32-dist +++ b/scripts/mk-w32-dist @@ -142,7 +142,7 @@ cp ${srcdir}/doc/README.W32 README-W32.txt todos README-W32.txt patches_defs= -for i in `find "$topdir/patches" -type f -name '*.diff'`; do +for i in `find "$topdir/patches" -type f \( -name '*.diff' -o -name '*.tar.gz' \)`; do cp $i . patches_defs="-DWITH_PATCHES" done diff --git a/scripts/w32installer.nsi b/scripts/w32installer.nsi index 317149d30..c292a0ae3 100644 --- a/scripts/w32installer.nsi +++ b/scripts/w32installer.nsi @@ -229,6 +229,7 @@ Section "Documentation" SecDoc !ifdef WITH_PATCHES SetOutPath "$INSTDIR\Src" File '*.diff' + File '*.tar.gz' !endif SectionEnd ; Section Documentation |