--- trunk/configure.ac	2005/10/27 15:25:13	36
+++ trunk/configure.ac	2013/01/13 14:53:25	470
@@ -1,5 +1,6 @@
 # configure.ac - for WinPT
-# Copyright (C) 2005 g10 Code GmbH
+# Copyright (C) 2005, 2006 g10 Code GmbH
+# Copyright (C) 2006, 2007 Timo Schulz
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -11,24 +12,32 @@
 
 # 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.5.4-svn, http://wald.intevation.org/projects/winpt)
+
+# We always force to use the minimal GPG version which is
+# known to be free of reported security issues
+NEED_GPG_VERSION=1.4.12
 
 NEED_GPGME_API=1
+#there is a WinPT problem with recent gpgme versions
+#NEED_GPGME_VERSION=1.3.1
 NEED_GPGME_VERSION=1.1.0
-NEED_GPG_ERROR_VERSION=1.2
+#NEED_GPG_ERROR_VERSION=1.10
+NEED_GPG_ERROR_VERSION=1.6
 
 PACKAGE=$PACKAGE_NAME
 PACKAGE_GT=${PACKAGE_NAME}
 VERSION=$PACKAGE_VERSION
 
-AC_CONFIG_SRCDIR(src/WinPT.cpp)
+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 +52,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,14 +62,25 @@
 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. */
-#define WINPT_MODERN_BUILD 1
-
+/* We need to include this header to be able to include specific parts
+   of the common controls header file. */
+#include <w32api.h>
+#define _WIN32_IE IE55
 ])
 
 AM_MAINTAINER_MODE
@@ -84,22 +106,15 @@
 AC_CHECK_TOOL(DLLTOOL, dlltool, :)
 AC_CHECK_TOOL(WINDRES, windres, :)
 
-
 try_gettext=yes
 have_dosish_system=no
 have_w32_system=no
 case "${host}" in
     *-mingw32*)
-        # special stuff for Windoze NT
+        # special stuff for Windoze NT/XP
         ac_cv_have_dev_random=no
-        AC_DEFINE(USE_ONLY_8DOT3,1,
-                  [set this to limit filenames to the 8.3 format])
-        AC_DEFINE(HAVE_DRIVE_LETTERS,1,
-                  [defined if we must run on a stupid file system])
         AC_DEFINE(USE_SIMPLE_GETTEXT,1,
-                  [because the Unix gettext has too much overhead on
-                   MingW32 systems and these systems lack Posix functions,
-                   we use a simplified version of gettext])
+                  [Use a lightweight gettext version for cross-compiling])
         have_dosish_system=yes
         have_w32_system=yes
         try_gettext="no"
@@ -114,11 +129,25 @@
        ;;
 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
-              (DOS, Windoze. OS/2) with special properties like
-              no file modes])
+             [Define this to indicate the binary is build for a system
+	      with special properties like no posix file modes])
 fi
 AM_CONDITIONAL(HAVE_DOSISH_SYSTEM, test "$have_dosish_system" = yes)
 
@@ -128,12 +157,10 @@
 AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes)
 
 
-
 #
 # Checks for libraries.
 #
 
-
 AM_PATH_GPGME("$NEED_GPGME_API:$NEED_GPGME_VERSION",
                have_gpgme=yes,have_gpgme=no)
 AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
@@ -141,7 +168,7 @@
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(string.h unistd.h langinfo.h termio.h locale.h)
+AC_CHECK_HEADERS(string.h unistd.h)
 
 AC_CHECK_FUNCS(stpcpy)
 
@@ -149,14 +176,13 @@
 AC_C_CONST
 AC_C_INLINE
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
 # 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
@@ -173,7 +199,6 @@
 AC_SUBST(W32LIBS)
 
 
-
 #
 # Print errors here so that they are visible all
 # together and the user can acquire them all together.
@@ -208,8 +233,16 @@
 fi
 
 
-AC_CONFIG_FILES([ Makefile
-src/Makefile
-src/versioninfo.rc        
+AC_CONFIG_FILES([
+Makefile
+PTD/Makefile
+PTD/versioninfo.rc
+Src/Makefile
+Src/versioninfo.rc
+Include/Makefile
+icons/Makefile
+m4/Makefile
+Gnupg/Makefile
 ])
+#Po/Makefile.in
 AC_OUTPUT