1.x: update autoconf, allow building with NLS disabled

git-svn-id: http://encfs.googlecode.com/svn/branches/1.x@128 db9cf616-1c43-0410-9cb8-a902689de0d6

ChangeLog

@@ -1,6 +1,17 @@
+Sun Nov 12 2013 Valient Gough <[email protected]>
+	* fix compiler warnings on OSX 10.9
+	* allow building with NLS disabled (configure --disable-nls)
+
+Wed Oct 2 2013 Valient Gough <[email protected]>
+	* adds delaymount option which delays initial mount.  Patch by Jeff King.
+	* fixes encfsctl cat command when iv chaining is enabled (issue #132)
+	* fix to POD documentation
+
+Sun Oct 21 2012 Valient Gough <[email protected]>
+	* apply license change to lgpl
+
 Wed Dec 28 2011 Valient Gough <[email protected]>
 	* remove m4-local
-	* bump version to 1.7.5
 
 Tue Dec 27 2011 Valient Gough <[email protected]>
 	* remove auto-generated libtool, add new m4 macros
@@ -22,7 +33,7 @@ Sun Sep 5 2010 Valient Gough <[email protected]>
 	  option passing mechanism in 1.7
 	* allow per-block random bytes to be configured independently of
 	  per-block MAC.
-	* bundle as version 1.7.2
+	* release versions 1.7.2 - 1.7.4
 
 Sun Aug 29 2010 Valient Gough <[email protected]>
 	* new IV initialization

configure.ac

@@ -1,9 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(encfs/encfs.h) dnl a source file from your sub dir
+AC_INIT([encfs], [1.7.5])
+AC_CONFIG_SRCDIR([encfs/encfs.h])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE(encfs, 1.7.5) dnl searches for some needed programs
 AC_CONFIG_MACRO_DIR([m4])
+AM_INIT_AUTOMAKE
 
 AC_CANONICAL_HOST
 AM_CONDITIONAL([DARWIN],

encfs/encfsctl.cpp

@@ -39,9 +39,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#ifdef __FreeBSD__
-#include <libintl.h>
-#endif
 
 #include "i18n.h"
 
@@ -802,7 +799,7 @@ int main(int argc, char **argv)
 {
     RLogInit( argc, argv );
 
-#ifdef LOCALEDIR
+#if defined(ENABLE_NLS) && defined(LOCALEDIR)
     setlocale( LC_ALL, "" );
     bindtextdomain( PACKAGE, LOCALEDIR );
     textdomain( PACKAGE );

encfs/i18n.h

@@ -21,7 +21,13 @@
 #ifndef _i18n_incl_
 #define _i18n_incl_
 
-#if defined(LOCALEDIR)
+#include "config.h"
+
+#if defined(ENABLE_NLS) && defined(LOCALEDIR)
+
+#ifdef __FreeBSD__
+#include <libintl.h>
+#endif
 
 #  include "gettext.h"
 // make shortcut for gettext
@@ -36,6 +42,7 @@ using gnu::autosprintf;
 #  define gettext_noop(STR) (STR)
 #  define _(STR) (STR)
 #  define N_(STR) (STR)
+#  define ngettext(STR1, STR2, N) ((N) == 1 ? (STR1) : (STR2))
 
 #endif
 

encfs/main.cpp

@@ -509,7 +509,7 @@ int main(int argc, char *argv[])
     // initialize the logging library
     RLogInit( argc, argv );
 
-#ifdef LOCALEDIR
+#if defined(ENABLE_NLS) && defined(LOCALEDIR)
     setlocale( LC_ALL, "" );
     bindtextdomain( PACKAGE, LOCALEDIR );
     textdomain( PACKAGE );