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.

89 lines
2.6 KiB

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