utils/ccrypt/patches/001-no-intl.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -106,17 +106,6 @@ AC_MSG_RESULT($UINT32_TYPE)
   4  AC_DEFINE_UNQUOTED(UINT32_TYPE,$UINT32_TYPE,unsigned 32 bit integer type)
   5
   6  dnl ----------------------------------------------------------------------
   7 -dnl Internationalization
   8 -
   9 -GETTEXT_PACKAGE=ccrypt
  10 -AC_SUBST(GETTEXT_PACKAGE)
  11 -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
  12 -
  13 -AM_GNU_GETTEXT
  14 -AM_GNU_GETTEXT_VERSION([0.14.3])
  15 -IT_PROG_INTLTOOL([0.34.2], [no-xml])
  16 -
  17 -dnl ----------------------------------------------------------------------
  18  dnl Libtool (needed by intl/)
  19
  20  AC_PROG_LIBTOOL
  21 @@ -135,9 +124,7 @@ AC_SUBST(TAR)
  22
  23  dnl ----------------------------------------------------------------------
  24  AC_OUTPUT([doc/ccrypt.1
  25 -          po/Makefile.in
  26            m4/Makefile
  27 -          intl/Makefile
  28            Makefile
  29            src/Makefile
  30            emacs/Makefile
  31 --- a/Makefile.am
  32 +++ b/Makefile.am
  33 @@ -4,11 +4,10 @@
  34
  35  ## Process this file with automake to produce Makefile.in
  36
  37 -SUBDIRS = m4 po intl src emacs doc check
  38 +SUBDIRS = m4 src emacs doc check
  39
  40 -EXTRA_DIST = m4/ChangeLog  config.rpath README-WIN intltool-extract.in \
  41 - intltool-merge.in intltool-update.in
  42 -DISTCLEANFILES = intltool-extract intltool-merge intltool-update
  43 +EXTRA_DIST = m4/ChangeLog  config.rpath README-WIN
  44 +DISTCLEANFILES =
  45
  46
  47  TAR = @TAR@
  48 --- a/Makefile.in
  49 +++ b/Makefile.in
  50 @@ -37,7 +37,7 @@ build_triplet = @build@
  51  host_triplet = @host@
  52  DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
  53         $(srcdir)/Makefile.in $(srcdir)/config.h.in \
  54 -       $(top_srcdir)/configure $(top_srcdir)/intl/Makefile.in \
  55 +       $(top_srcdir)/configure \
  56         ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS config.guess \
  57         config.rpath config.sub depcomp elisp-comp install-sh \
  58         ltmain.sh missing mkinstalldirs
  59 @@ -64,7 +64,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
  60   configure.lineno configure.status.lineno
  61  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  62  CONFIG_HEADER = config.h
  63 -CONFIG_CLEAN_FILES = intl/Makefile
  64 +CONFIG_CLEAN_FILES =
  65  SOURCES =
  66  DIST_SOURCES =
  67  RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
  68 @@ -251,11 +251,10 @@ sbindir = @sbindir@
  69  sharedstatedir = @sharedstatedir@
  70  sysconfdir = @sysconfdir@
  71  target_alias = @target_alias@
  72 -SUBDIRS = m4 po intl src emacs doc check
  73 -EXTRA_DIST = m4/ChangeLog  config.rpath README-WIN intltool-extract.in \
  74 - intltool-merge.in intltool-update.in
  75 +SUBDIRS = m4 src emacs doc check
  76 +EXTRA_DIST = m4/ChangeLog  config.rpath README-WIN
  77
  78 -DISTCLEANFILES = intltool-extract intltool-merge intltool-update
  79 +DISTCLEANFILES =
  80  ACLOCAL_AMFLAGS = -I m4
  81  all: config.h
  82         $(MAKE) $(AM_MAKEFLAGS) all-recursive
  83 --- a/src/Makefile.am
  84 +++ b/src/Makefile.am
  85 @@ -17,7 +17,7 @@ ccrypt_DEPENDENCIES = @EXTRA_OBJS@
  86
  87  localedir = $(datadir)/locale
  88  INCLUDES = -I../intl -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\"
  89 -LIBS = @LIBINTL@ @LIBS@
  90 +LIBS = @LIBS@
  91
  92  maketables: maketables.c
  93
  94 --- a/src/Makefile.in
  95 +++ b/src/Makefile.in
  96 @@ -170,7 +170,7 @@ LDFLAGS = @LDFLAGS@
  97  LIBICONV = @LIBICONV@
  98  LIBINTL = @LIBINTL@
  99  LIBOBJS = @LIBOBJS@
 100 -LIBS = @LIBINTL@ @LIBS@
 101 +LIBS = @LIBS@
 102  LIBTOOL = @LIBTOOL@
 103  LN_S = @LN_S@
 104  LTLIBICONV = @LTLIBICONV@