Integrated winPT.
authorWerner Koch <wk@gnupg.org>
Thu, 3 Nov 2005 11:00:28 +0000 (11:00 +0000)
committerWerner Koch <wk@gnupg.org>
Thu, 3 Nov 2005 11:00:28 +0000 (11:00 +0000)
ChangeLog
Makefile.am
configure.ac
packages/download.sh

index 7c63478..c09efd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-03  Werner Koch  <wk@g10code.com>
 
+       * configure.ac (winpt): Made it a source package.
+
        * configure.ac: Bail out if a required tool is missing.
 
 2005-11-02  Werner Koch  <wk@g10code.com>
index d70e596..463581e 100644 (file)
@@ -19,6 +19,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = dist-bzip2
+DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc
 
 SUBDIRS = packages include src
 
index dd4a690..82e1fb4 100644 (file)
@@ -30,7 +30,7 @@ VERSION=$PACKAGE_VERSION
 AC_CONFIG_SRCDIR(include/config.nsi.in)
 AC_CONFIG_MACRO_DIR(m4)
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
@@ -78,9 +78,8 @@ GPG4WIN_BPKG_GTK_DEV([glib], [pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([gtk+], [atk pango glib libiconv gettext pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([atk], [glib pkgconfig])
 GPG4WIN_BPKG_GTK_DEV([pango], [glib pkgconfig])
-#fixme: Theseare intermediate package.
+#fixme: These are intermediate package.
 GPG4WIN_BPKG_BINSRC([gpgee], [gnupg])
-GPG4WIN_BPKG_BINSRC([winpt], [gpgme gnupg])
 
 
 GPG4WIN_SPKG([libgpg-error], [libiconv gettext])
@@ -88,7 +87,7 @@ GPG4WIN_SPKG([gpgme], [libgpg-error gnupg])
 GPG4WIN_SPKG([gnupg])
 GPG4WIN_SPKG([gpgol], [gpgme])
 GPG4WIN_SPKG([gpa], [libiconv gettext zlib gtk+ libpng glib gpgme])
-#GPG4WIN_SPKG([winpt], [gpgme gnupg])
+GPG4WIN_SPKG([winpt], [gpgme gnupg])
 
 GPG4WIN_FINALIZE
 
index 4b064b9..37bfbd2 100644 (file)
@@ -78,8 +78,7 @@ ${WGET} -c ${server_gimp}/pkgconfig-0.15.0.tar.gz
 #server_winpt="http://wald.intevation.org/frs/download.php"
 server_winpt="ftp://ftp.g10code.com/g10code/scratch"
 
-${WGET} -c ${server_winpt}/winpt-0.10.2_beta-bin.zip
-${WGET} -c ${server_winpt}/winpt-0.10.2_beta-src.zip
+${WGET} -c ${server_winpt}/winpt-0.11.0-cvs.tar.bz2
 
 # GPGee
 # Note: This is a temporary location