Nicer W32 installation support

diff --git a/trunk/autogen.sh b/trunk/autogen.sh
index a386bb0c29209dcce24702a501367439b5b891a0..10b498c4a5e31fa36c53c2970f1ffa77e3b2a5cf 100755 (executable)
--- a/trunk/autogen.sh
+++ b/trunk/autogen.sh
@@ -31,7 +31,13 @@ if test "$1" = "--build-w32"; then
         fi
     fi
 
-    crossbindir=`mingw32 --install-dir`/bin
+    crossinstalldir=`mingw32 --install-dir`
+    crossbindir=`mingw32 --get-bindir 2>/dev/null` \
+               || crossbindir="$crossinstalldir/bin"
+    crosslibdir=`mingw32 --get-libdir 2>/dev/null` \
+               || crosslibdir="$crossinstalldir/i386--mingw32/lib"
+    crossincdir=`mingw32 --get-includedir 2>/dev/null` \
+               || crossincdir="$crossinstalldir/i386--mingw32/include"
     CC=`mingw32 --get-path gcc`
     CPP=`mingw32 --get-path cpp`
     AR=`mingw32 --get-path ar`
@@ -54,8 +60,9 @@ if test "$1" = "--build-w32"; then
     fi
     [ $DIE = yes ] && exit 1
 
-    ./configure --host=${host} --target=${target} \
-                ${disable_foo_tests} $*
+    ./configure --host=${host} --target=${target}  ${disable_foo_tests} \
+                --bindir=${crossbindir} --libdir=${crosslibdir} \
+                --includedir=${crossincdir}  $*
     exit $?
 fi
 

diff --git a/trunk/configure.in b/trunk/configure.in
index 79239a7a7e1d26f7244e67a1489e292884fac94f..9eb81d1627d4720c4e6edfacb114d920e424a012 100644 (file)
--- a/trunk/configure.in
+++ b/trunk/configure.in
@@ -24,8 +24,6 @@ AC_SUBST(LIBGPGME_LT_AGE)
 AC_SUBST(LIBGPGME_LT_REVISION)
 
 
-AM_MAINTAINER_MODE
-
 dnl
 dnl Checks for programs
 dnl