[Gpg4win-commits] r413 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2007-06-15 16:31:33 +0200 (Fri, 15 Jun 2007)
New Revision: 413

Modified:
   trunk/ChangeLog
   trunk/README
   trunk/autogen.sh
   trunk/src/Makefile.am
   trunk/src/gpg4win.mk.in
Log:
Build fixes for gnupg2.  
Please see README.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-06-15 12:35:46 UTC (rev 412)
+++ trunk/ChangeLog	2007-06-15 14:31:33 UTC (rev 413)
@@ -1,5 +1,7 @@
 2007-06-15  Werner Koch  <wk at g10code.com>
 
+	* src/gpg4win.mk.in: Add cruel hack to support gnupg2.
+
 	* src/Makefile.am: Use --silent with most configure runs.
 
 	* src/uninst-gnupg2.nsi, src/inst-libgnupg2.nsi: New.

Modified: trunk/README
===================================================================
--- trunk/README	2007-06-15 12:35:46 UTC (rev 412)
+++ trunk/README	2007-06-15 14:31:33 UTC (rev 413)
@@ -12,14 +12,11 @@
    [...]
    $ cd ..
 
-   If you have downloaded gnupg-2.x, you need to repack it so that the
-   name of the apckage is gnupg2. For example:
+   If you have downloaded gnupg-2.x, you need to rename that tarball.
+   e.g.:
    
-    tar xjf gnupg-2.0.5.tar.bz2 
-    mv gnupg-2.0.5 gnupg2-2.0.5
-    tar chf gnupg2-2.0.5.tar.bz2 gnupg2-2.0.5
+     mv gnupg-2.0.5.tar.bz2 gnupg2-2.0.5.tar.bz2
 
-
 2. Configure the source tree for cross compilation:
 
    $ configure --host=i586-mingw32msvc
@@ -50,7 +47,7 @@
  texinfo
  imagemagick
  tetex-bin
- tetex-extra
+ tr
  gs-common
  hyperlatex
 

Modified: trunk/autogen.sh
===================================================================
--- trunk/autogen.sh	2007-06-15 12:35:46 UTC (rev 412)
+++ trunk/autogen.sh	2007-06-15 14:31:33 UTC (rev 413)
@@ -37,7 +37,7 @@
 
 DIE=no
 FORCE=
-if test "$1" = "--force"; then
+if test x"$1" = x"--force"; then
   FORCE=" --force"
   shift
 fi

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2007-06-15 12:35:46 UTC (rev 412)
+++ trunk/src/Makefile.am	2007-06-15 14:31:33 UTC (rev 413)
@@ -83,7 +83,8 @@
   --with-libassuan-prefix=$(idir) \
   --with-zlib=$(idir) \
   --with-pth-prefix=$(idir) \
-  --without-included-gettext
+  --without-included-gettext \
+  --disable-regex
 
 
 # Glib doesn't add the LDFLAGS automatically.

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2007-06-15 12:35:46 UTC (rev 412)
+++ trunk/src/gpg4win.mk.in	2007-06-15 14:31:33 UTC (rev 413)
@@ -80,6 +80,8 @@
 # Support macro.  Unpack the archive $(1).
 define DEFLATE_macro
 	case "$(1)" in			\
+          */gnupg2-2.*.tar.bz2)          \
+            $(TAR) -xj --transform='s,^gnupg-,gnupg2-,' -f "$(1)" ;; \
 	  *.tar.gz | *.tgz)		\
 	    $(TAR) xzf "$(1)" ;;	\
 	  *.tar.bz2 | *.tbz2 | *.tbz)	\