[svn] GnuPG - r5158 - branches/STABLE-BRANCH-1-4/scripts

[svn author wk]

Author: wk
Date: 2009-09-05 20:07:00 +0200 (Sat, 05 Sep 2009)
New Revision: 5158

Modified:
   branches/STABLE-BRANCH-1-4/scripts/ChangeLog
   branches/STABLE-BRANCH-1-4/scripts/autogen.sh
   branches/STABLE-BRANCH-1-4/scripts/mk-w32-dist
   branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi
Log:
Make it easier to distribute bzip2


Modified: branches/STABLE-BRANCH-1-4/scripts/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/ChangeLog	2009-09-04 17:52:40 UTC (rev 5157)
+++ branches/STABLE-BRANCH-1-4/scripts/ChangeLog	2009-09-05 18:07:00 UTC (rev 5158)
@@ -1,3 +1,7 @@
+2009-09-05  Werner Koch  <wk at g10code.com>
+
+	* autogen.sh <--build-w32>: Pass --with-bzip2.
+
 2009-09-03  Werner Koch  <wk at g10code.com>
 
 	* w32installer.nsi: Set the final OutPath to Doc/.

Modified: branches/STABLE-BRANCH-1-4/scripts/autogen.sh
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/autogen.sh	2009-09-04 17:52:40 UTC (rev 5157)
+++ branches/STABLE-BRANCH-1-4/scripts/autogen.sh	2009-09-05 18:07:00 UTC (rev 5158)
@@ -51,6 +51,9 @@
     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 @@
     [ $DIE = yes ] && exit 1
 
     $tsdir/configure ${conf_CC} --build=${build} --host=${host} \
+                --with-bzip2=${w32root} \
                 ${disable_foo_tests}  $*
     exit $?
 fi

Modified: branches/STABLE-BRANCH-1-4/scripts/mk-w32-dist
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/mk-w32-dist	2009-09-04 17:52:40 UTC (rev 5157)
+++ branches/STABLE-BRANCH-1-4/scripts/mk-w32-dist	2009-09-05 18:07:00 UTC (rev 5158)
@@ -142,7 +142,7 @@
 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

Modified: branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi
===================================================================
--- branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi	2009-09-04 17:52:40 UTC (rev 5157)
+++ branches/STABLE-BRANCH-1-4/scripts/w32installer.nsi	2009-09-05 18:07:00 UTC (rev 5158)
@@ -229,6 +229,7 @@
 !ifdef WITH_PATCHES
   SetOutPath "$INSTDIR\Src"
   File '*.diff'
+  File '*.tar.gz'
 !endif
 
 SectionEnd ; Section Documentation