extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2025-08-09 14:04:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://encfs.googlecode.com/svn/branches/1.x@128 db9cf616-1c43-0410-9cb8-a902689de0d6
This commit is contained in:
Valient Gough
2013-11-13 05:31:57 +00:00
parent 96d21a4d54
commit 07b35f2b49
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,6 +1,17 @@
Sun Nov 12 2013 Valient Gough <vgough@pobox.com>
* fix compiler warnings on OSX 10.9
* allow building with NLS disabled (configure --disable-nls)
Wed Oct 2 2013 Valient Gough <vgough@pobox.com>
* 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 <vgough@pobox.com>
* apply license change to lgpl
Wed Dec 28 2011 Valient Gough <vgough@pobox.com> Wed Dec 28 2011 Valient Gough <vgough@pobox.com>
* remove m4-local * remove m4-local
* bump version to 1.7.5
Tue Dec 27 2011 Valient Gough <vgough@pobox.com> Tue Dec 27 2011 Valient Gough <vgough@pobox.com>
* remove auto-generated libtool, add new m4 macros * remove auto-generated libtool, add new m4 macros
@ -22,7 +33,7 @@ Sun Sep 5 2010 Valient Gough <vgough@pobox.com>
option passing mechanism in 1.7 option passing mechanism in 1.7
* allow per-block random bytes to be configured independently of * allow per-block random bytes to be configured independently of
per-block MAC. per-block MAC.
* bundle as version 1.7.2 * release versions 1.7.2 - 1.7.4
Sun Aug 29 2010 Valient Gough <vgough@pobox.com> Sun Aug 29 2010 Valient Gough <vgough@pobox.com>
* new IV initialization * new IV initialization

5
configure.ac
View File

@ -1,9 +1,10 @@
dnl Process this file with autoconf to produce a configure script. 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]) AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE(encfs, 1.7.5) dnl searches for some needed programs
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
AC_CANONICAL_HOST AC_CANONICAL_HOST
AM_CONDITIONAL([DARWIN], AM_CONDITIONAL([DARWIN],

5
encfs/encfsctl.cpp
View File

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

9
encfs/i18n.h
View File

@ -21,7 +21,13 @@
#ifndef _i18n_incl_ #ifndef _i18n_incl_
#define _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" # include "gettext.h"
// make shortcut for gettext // make shortcut for gettext
@ -36,6 +42,7 @@ using gnu::autosprintf;
# define gettext_noop(STR) (STR) # define gettext_noop(STR) (STR)
# define _(STR) (STR) # define _(STR) (STR)
# define N_(STR) (STR) # define N_(STR) (STR)
# define ngettext(STR1, STR2, N) ((N) == 1 ? (STR1) : (STR2))
#endif #endif

2
encfs/main.cpp
View File

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