--- trunk/configure.ac	2005/11/21 12:06:59	88
+++ trunk/configure.ac	2006/01/09 09:15:29	133
@@ -15,10 +15,9 @@
 
 # Version number: Remember to change it immediately *after* a release.
 #                 Add a "-cvs" prefix for non-released code.
-AC_INIT(WinPT, 0.11.1-cvs, http://www.winpt.org)
-
+AC_INIT(WinPT, 0.11.5-cvs, http://www.winpt.org)
 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
@@ -29,6 +28,7 @@
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_TARGET()
 AM_INIT_AUTOMAKE
+AM_MKINSTALLDIRS
 
 AC_GNU_SOURCE
 
@@ -72,9 +72,6 @@
    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. */
@@ -136,6 +133,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
@@ -236,11 +248,9 @@
 Src/Makefile
 Src/versioninfo.rc        
 Include/Makefile
-Ico/Makefile
 icons/Makefile
 m4/Makefile
-w32gpgme/Makefile
 Gnupg/Makefile
-Po/Makefile
+Po/Makefile.in
 ])
 AC_OUTPUT