Make it easier to distribute bzip2
authorWerner Koch <wk@gnupg.org>
Sat, 5 Sep 2009 18:07:00 +0000 (18:07 +0000)
committerWerner Koch <wk@gnupg.org>
Sat, 5 Sep 2009 18:07:00 +0000 (18:07 +0000)
scripts/ChangeLog
scripts/autogen.sh
scripts/mk-w32-dist
scripts/w32installer.nsi

index eca136a..804455c 100644 (file)
@@ -1,3 +1,7 @@
+2009-09-05  Werner Koch  <wk@g10code.com>
+
+       * autogen.sh <--build-w32>: Pass --with-bzip2.
+
 2009-09-03  Werner Koch  <wk@g10code.com>
 
        * w32installer.nsi: Set the final OutPath to Doc/.
index 232de14..0bb2337 100755 (executable)
@@ -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
index 4b03b9b..f3ed20b 100755 (executable)
@@ -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
index 317149d..c292a0a 100644 (file)
@@ -229,6 +229,7 @@ Section "Documentation" SecDoc
 !ifdef WITH_PATCHES
   SetOutPath "$INSTDIR\Src"
   File '*.diff'
+  File '*.tar.gz'
 !endif
 
 SectionEnd ; Section Documentation