--- trunk/configure.ac	2005/11/02 11:29:44	57
+++ trunk/configure.ac	2006/11/05 08:57:45	271
@@ -1,5 +1,5 @@
 # configure.ac - for WinPT
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2006 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -11,14 +11,14 @@
 
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-min_automake_version="1.9.4"
+min_automake_version="1.9.2"
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.0-cvs, http://www.winpt.org)
-
+AC_INIT(WinPT, 1.1.0, http://wald.intevation.org/projects/winpt)
+NEED_GPG_VERSION=1.4.2
 NEED_GPGME_API=1
-NEED_GPGME_VERSION=1.1.0
+NEED_GPGME_VERSION=1.1.1
 NEED_GPG_ERROR_VERSION=1.2
 
 PACKAGE=$PACKAGE_NAME
@@ -28,7 +28,8 @@
 AC_CONFIG_SRCDIR(Src/WinPT.cpp)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_TARGET()
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE
+AM_MKINSTALLDIRS
 
 AC_GNU_SOURCE
 
@@ -43,6 +44,8 @@
                                         [Bug report address])
 AC_DEFINE_UNQUOTED(NEED_GPGME_VERSION, "$NEED_GPGME_VERSION",
                                        [Required version of GPGME])
+AC_DEFINE_UNQUOTED(NEED_GPG_VERSION, "$NEED_GPG_VERSION",
+				     [Required version of GnuPG])
 
 BUILD_TIMESTAMP=`date --iso-8601=minutes`
 AC_SUBST(BUILD_TIMESTAMP)
@@ -51,25 +54,26 @@
 changequote([,])dnl
 AC_SUBST(BUILD_FILEVERSION)
 
+# For the distcheck target of make we need to set a few options for
+# the cross compiling environment.  We assume the same conevtion as
+# used in autogen.sh; i.e. we take the root from the $w32root variable
+# or default to ~/w32root.
+if test -n "$w32root"; then 
+  W32ROOT="$w32root"
+else
+  W32ROOT="$HOME/w32root"
+fi
+AC_SUBST(W32ROOT)
+
 
 AH_BOTTOM([
 /* Some global constants. */
 
-/* Set to distinguish between the old custom Makefile based build
-   system and our new automake based one.  This is only required in
-   Include/wptVersion.h.  Fixme: See whether we may define the constants
-   there by means of command line apssed args or similar.  */
-#define WINPT_MODERN_BUILD 1
-
-/* FIXME: For what is this needed? */
-#define WINPT_IPC 1 
-
 /* We need to include this header to be able to include specific parts
    of the header files.  For now we require at least Internet Exploder
    4.01 to be installed. */
 #include <w32api.h>
-#define _WIN32_IE IE401
-
+#define _WIN32_IE IE55
 ])
 
 AM_MAINTAINER_MODE
@@ -95,7 +99,6 @@
 AC_CHECK_TOOL(DLLTOOL, dlltool, :)
 AC_CHECK_TOOL(WINDRES, windres, :)
 
-
 try_gettext=yes
 have_dosish_system=no
 have_w32_system=no
@@ -125,6 +128,21 @@
        ;;
 esac
 
+
+AH_BOTTOM([
+/* Force using of NLS for W32 even if no libintl has been found.  This is
+   okay because we have our own gettext implementation for W32.  */
+#if defined(HAVE_W32_SYSTEM) && !defined(ENABLE_NLS)
+#define ENABLE_NLS 1
+#endif
+])
+   
+# Note, that autogen.sh greps for the next line.
+AM_GNU_GETTEXT_VERSION(0.12.1)
+AM_GNU_GETTEXT([external])
+# There is something wrong with the NLS checking here.  We force using it.
+USE_NLS=yes
+
 if test "$have_dosish_system" = yes; then
    AC_DEFINE(HAVE_DOSISH_SYSTEM,1,
              [Defined if we run on some of the PCDOS like systems
@@ -167,7 +185,7 @@
 # Add some extra libs here so that previous tests don't fail for
 # mysterious reasons - the final link step should bail out.
 if test "$have_w32_system" = yes; then
-   W32LIBS="-lwsock32"
+   W32LIBS="-lws2_32"
 fi
 
 if test "$GCC" = yes; then
@@ -221,13 +239,13 @@
 
 AC_CONFIG_FILES([ Makefile
 PTD/Makefile
-PTD/versioninfo.rc        
+PTD/versioninfo.rc
 Src/Makefile
-Src/versioninfo.rc        
+Src/versioninfo.rc
 Include/Makefile
-Ico/Makefile
+icons/Makefile
 m4/Makefile
-w32gpgme/Makefile
 Gnupg/Makefile
+Po/Makefile.in
 ])
 AC_OUTPUT