Does now compile under MingW32/CPD 0.3

diff --git a/trunk/ChangeLog b/trunk/ChangeLog
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f11e6dac074f37c43ef7743b991c3bb1fdb0c894 100644 (file)
--- a/trunk/ChangeLog
+++ b/trunk/ChangeLog
@@ -0,0 +1,4 @@
+2001-01-18  Werner Koch  <wk@gnupg.org>
+
+       * autogen.sh: Added option --build-w32.
+

diff --git a/trunk/autogen.sh b/trunk/autogen.sh
index 11b27612cffd62d2fe40223c502e1792af2d382b..a386bb0c29209dcce24702a501367439b5b891a0 100755 (executable)
--- a/trunk/autogen.sh
+++ b/trunk/autogen.sh
@@ -3,27 +3,27 @@
 # It is only needed for the CVS version.
 
 PGM=GPGME
-DIE=no
+lib_config_files=""
+autoconf_vers=2.13
+automake_vers=1.4
+aclocal_vers=1.4
+libtool_vers=1.3
 
-#
-# Use --build-w32 to prepare the cross compiling build for Windoze
-#
+DIE=no
 if test "$1" = "--build-w32"; then
     shift
     target=i386--mingw32
+    if [ ! -f ./config.guess ]; then
+        echo "./config.guess not found" >&2
+        exit 1
+    fi
     host=`./config.guess`
         
-    CC="${target}-gcc"
-    CPP="${target}-gcc -E"
-    RANLIB="${target}-ranlib"
-        
-    cc_version=`$CC --version`
-    if ! echo "$cc_version" | egrep '[0-9]+wk[0-9]+' ; then
-        echo "gcc version $cc_version is not supported" >&2
-        echo "see doc/README.W32 for instructions" >&2
+    if ! mingw32 --version >/dev/null; then
+        echo "We need at least version 0.3 of MingW32/CPD" >&2
         exit 1
     fi
-        
+
     if [ -f config.h ]; then
         if grep HAVE_DOSISH_SYSTEM config.h | grep undef >/dev/null; then
             echo "Pease run a 'make distclean' first" >&2
@@ -31,16 +31,35 @@ if test "$1" = "--build-w32"; then
         fi
     fi
 
-    export CC CPP RANLIB
-    ./configure --host=${host} --target=${target} $*
+    crossbindir=`mingw32 --install-dir`/bin
+    CC=`mingw32 --get-path gcc`
+    CPP=`mingw32 --get-path cpp`
+    AR=`mingw32 --get-path ar`
+    RANLIB=`mingw32 --get-path ranlib`
+    export CC CPP AR RANLIB 
+
+    disable_foo_tests=""
+    if [ -n "$lib_config_files" ]; then
+        for i in $lib_config_files; do
+            j=`echo $i | tr '[a-z-]' '[A-Z_]'`
+            eval "$j=${crossbindir}/$i"
+            export $j
+            disable_foo_tests="$disable_foo_tests --disable-`echo $i| \
+                           sed 's,-config$,,'`-test"
+            if [ ! -f "${crossbindir}/$i" ]; then                   
+                echo "$i not installed for MingW32" >&2
+                DIE=yes
+            fi
+        done
+    fi
+    [ $DIE = yes ] && exit 1
+
+    ./configure --host=${host} --target=${target} \
+                ${disable_foo_tests} $*
     exit $?
 fi
 
 
-autoconf_vers=2.13
-automake_vers=1.4
-aclocal_vers=1.4
-libtool_vers=1.3
 
 if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then
     if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \

diff --git a/trunk/build-w32 b/trunk/build-w32
deleted file mode 100755 (executable)
index bb72045..0000000
--- a/trunk/build-w32
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-target=i386--mingw32
-host=`./config.guess`
-
-CC="${target}-gcc"
-CPP="${target}-gcc -E"
-RANLIB="${target}-ranlib"
-
-export CC CPP RANLIB
-./configure --host=${host} --target=${target} $*

diff --git a/trunk/configure.in b/trunk/configure.in
index 839ca82db72c87e2140322dbe6fa7119682729a1..79239a7a7e1d26f7244e67a1489e292884fac94f 100644 (file)
--- a/trunk/configure.in
+++ b/trunk/configure.in
@@ -13,7 +13,7 @@ AM_MAINTAINER_MODE
 #    AGE, set REVISION to 0.
 # 3. Interfaces removed (BAD, breaks upward compatibility): Increment
 #    CURRENT, set AGE and REVISION to 0.
-AM_INIT_AUTOMAKE(gpgme,0.1.4)
+AM_INIT_AUTOMAKE(gpgme,0.1.4a)
 LIBGPGME_LT_CURRENT=2
 LIBGPGME_LT_AGE=2
 LIBGPGME_LT_REVISION=0

diff --git a/trunk/gpgme/gpgme.c b/trunk/gpgme/gpgme.c
index 10bdd8aedff829794766feeb5a251706bb9d97db..aea18fa566fdb8325ae02f158ad744d8d5e7d506 100644 (file)
--- a/trunk/gpgme/gpgme.c
+++ b/trunk/gpgme/gpgme.c
@@ -176,7 +176,7 @@ gpgme_set_textmode ( GpgmeCtx c, int yes )
 void
 gpgme_set_keylist_mode ( GpgmeCtx c, int mode )
 {
-    if (c)
+    if (!c)
         return;
     c->keylist_mode = mode;
 }

diff --git a/trunk/gpgme/gpgme.h b/trunk/gpgme/gpgme.h
index 57e01304eb3e004d78de6bce3a1c515b7a28cb3c..0fe59f78ee6e0f6f05e34b52fe33da6b9fda6ed4 100644 (file)
--- a/trunk/gpgme/gpgme.h
+++ b/trunk/gpgme/gpgme.h
@@ -42,7 +42,7 @@ extern "C" {
  * let autoconf (using the AM_PATH_GPGME macro) check that this
  * header matches the installed library.
  * Warning: Do not edit the next line.  configure will do that for you! */
-#define GPGME_VERSION "0.1.4"
+#define GPGME_VERSION "0.1.4a"