You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

99 lines
3.0 KiB

  1. diff --git a/Makefile.am b/Makefile.am
  2. index bfe1d43..2f45264 100644
  3. --- a/Makefile.am
  4. +++ b/Makefile.am
  5. @@ -4,7 +4,7 @@
  6. ## Process this file with automake to produce Makefile.in
  7. -SUBDIRS = m4 po intl src emacs doc check
  8. +SUBDIRS = m4 src emacs doc check
  9. EXTRA_DIST = m4/ChangeLog config.rpath README-WIN
  10. diff --git a/Makefile.in b/Makefile.in
  11. index 314e162..18dcff3 100644
  12. --- a/Makefile.in
  13. +++ b/Makefile.in
  14. @@ -117,7 +117,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  15. configure.lineno config.status.lineno
  16. mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  17. CONFIG_HEADER = config.h
  18. -CONFIG_CLEAN_FILES = intl/Makefile
  19. +CONFIG_CLEAN_FILES =
  20. CONFIG_CLEAN_VPATH_FILES =
  21. AM_V_P = $(am__v_P_@AM_V@)
  22. am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
  23. @@ -177,7 +177,7 @@ CTAGS = ctags
  24. CSCOPE = cscope
  25. DIST_SUBDIRS = $(SUBDIRS)
  26. am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
  27. - $(top_srcdir)/intl/Makefile.in ABOUT-NLS AUTHORS COPYING \
  28. + ABOUT-NLS AUTHORS COPYING \
  29. ChangeLog INSTALL NEWS README compile config.guess \
  30. config.rpath config.sub install-sh ltmain.sh missing \
  31. mkinstalldirs
  32. @@ -403,7 +403,7 @@ target_alias = @target_alias@
  33. top_build_prefix = @top_build_prefix@
  34. top_builddir = @top_builddir@
  35. top_srcdir = @top_srcdir@
  36. -SUBDIRS = m4 po intl src emacs doc check
  37. +SUBDIRS = m4 src emacs doc check
  38. EXTRA_DIST = m4/ChangeLog config.rpath README-WIN
  39. ACLOCAL_AMFLAGS = -I m4
  40. all: config.h
  41. diff --git a/configure.ac b/configure.ac
  42. index 56d11f1..6d32602 100644
  43. --- a/configure.ac
  44. +++ b/configure.ac
  45. @@ -148,17 +148,6 @@ fi
  46. AC_MSG_RESULT($UINT32_TYPE)
  47. AC_DEFINE_UNQUOTED(UINT32_TYPE,$UINT32_TYPE,unsigned 32 bit integer type)
  48. -dnl ----------------------------------------------------------------------
  49. -dnl Internationalization
  50. -
  51. -GETTEXT_PACKAGE=ccrypt
  52. -AC_SUBST(GETTEXT_PACKAGE)
  53. -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
  54. -
  55. -AM_GNU_GETTEXT
  56. -AM_GNU_GETTEXT_VERSION([0.19.8])
  57. -dnl IT_PO_SUBDIR(po)
  58. -
  59. dnl ----------------------------------------------------------------------
  60. dnl Libtool (needed by intl/)
  61. @@ -180,9 +169,7 @@ AC_SUBST(TAR)
  62. dnl ----------------------------------------------------------------------
  63. AC_CONFIG_FILES([doc/ccrypt.1
  64. doc/ccguess.1
  65. - po/Makefile.in
  66. m4/Makefile
  67. - intl/Makefile
  68. Makefile
  69. src/Makefile
  70. emacs/Makefile
  71. diff --git a/src/Makefile.am b/src/Makefile.am
  72. index 4cb1d03..ff33d59 100644
  73. --- a/src/Makefile.am
  74. +++ b/src/Makefile.am
  75. @@ -56,4 +56,4 @@ uninstall-local:
  76. # internationalization stuff
  77. localedir = $(datadir)/locale
  78. AM_CPPFLAGS = @EXTRA_INCLUDES@ -I../intl -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\"
  79. -LIBS = @LIBINTL@ @LIBS@
  80. +LIBS = @LIBS@
  81. diff --git a/src/Makefile.in b/src/Makefile.in
  82. index 27c7d28..01c6764 100644
  83. --- a/src/Makefile.in
  84. +++ b/src/Makefile.in
  85. @@ -278,7 +278,7 @@ LIBMULTITHREAD = @LIBMULTITHREAD@
  86. LIBOBJS = @LIBOBJS@
  87. LIBPTH = @LIBPTH@
  88. LIBPTH_PREFIX = @LIBPTH_PREFIX@
  89. -LIBS = @LIBINTL@ @LIBS@
  90. +LIBS = @LIBS@
  91. LIBTHREAD = @LIBTHREAD@
  92. LIBTOOL = @LIBTOOL@
  93. LIPO = @LIPO@