Reverted to gettext 0.10.35 in intl/ added m4/ directory to allow sys…

…tem independent rebuild of configure stuff

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@736 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

ChangeLog

@@ -1,4 +1,8 @@
 CVS code - 
+- General
+	- Reverted included gettext from 0.10.38 to 0.10.35 in intl/ dir.
+	- Added m4/ directory to allow rebuilding using only the internal
+	  version of gettext.m4 (Albert Chin).
 - nano.c:
   main()
 	- Change the getop option to 'F' (David Lawrence Ramsey)

Makefile.am

@@ -1,4 +1,10 @@
 ## $Id$
+AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
+ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \
+	$(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4
+
 bin_PROGRAMS = 	nano
 nano_SOURCES =	color.c \
 		cut.c \
@@ -14,16 +20,19 @@ nano_SOURCES =	color.c \
 		winio.c 
 
 man_MANS = nano.1
-nano_LDADD = @INTLLIBS@
+nano_LDADD = @GLIB_LIBS@ @INTLLIBS@
 
 info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split
 
 EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
 		README THANKS TODO install-sh missing mkinstalldirs \
-		nano.1 nano.1.html faq.html nanorc.sample
+		nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS)
 
 SUBDIRS = po intl
 
-localedir = $(datadir)/locale
+localedir = @LOCALE_DIR@
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
+
+$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS)
+	cat $(ACINCLUDE_INPUTS) > $@

Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -57,27 +57,26 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
-host_triplet = @host@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CURSES_LIB = @CURSES_LIB@
 DATADIRNAME = @DATADIRNAME@
 GENCAT = @GENCAT@
-GLIBC21 = @GLIBC21@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_CONFIG = @GLIB_CONFIG@
 GLIB_LIBS = @GLIB_LIBS@
 GMOFILES = @GMOFILES@
 GMSGFMT = @GMSGFMT@
+GNU_LOCALE_DIR = @GNU_LOCALE_DIR@
+GT_NO = @GT_NO@
+GT_YES = @GT_YES@
+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
 INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
+INTLDEPS = @INTLDEPS@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LIBICONV = @LIBICONV@
+LOCALE_DIR = @LOCALE_DIR@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
@@ -87,23 +86,30 @@ RANLIB = @RANLIB@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
+l = @l@
+
+AUTOMAKE_OPTIONS = gnu no-dependencies
+M4DIR = $(srcdir)/m4
+ACLOCAL_AMFLAGS = -I $(M4DIR)
+ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 	$(M4DIR)/lcmessage.m4 $(M4DIR)/progtest.m4
+
 
 bin_PROGRAMS = nano
 nano_SOURCES = color.c 		cut.c 		files.c 		global.c 		move.c 		nano.c 		nano.h 		proto.h 		rcfile.c 		search.c 		utils.c 		winio.c 
 
 
 man_MANS = nano.1
-nano_LDADD = @INTLLIBS@
+nano_LDADD = @GLIB_LIBS@ @INTLLIBS@
 
 info_TEXINFOS = nano.texi
 MAKEINFO = makeinfo --no-split
 
-EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS 		README THANKS TODO install-sh missing mkinstalldirs 		nano.1 nano.1.html faq.html nanorc.sample
+EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS 		README THANKS TODO install-sh missing mkinstalldirs 		nano.1 nano.1.html faq.html nanorc.sample $(ACINCLUDE_INPUTS)
 
 
 SUBDIRS = po intl
 
-localedir = $(datadir)/locale
+localedir = @LOCALE_DIR@
 INCLUDES = -Iintl -DLOCALEDIR=\"$(localedir)\" -I@includedir@
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -156,9 +162,9 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 $(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
@@ -318,7 +324,7 @@ uninstall-info:
 	else ii=; fi; \
 	list='$(INFO_DEPS)'; \
 	for file in $$list; do \
-	  test -z "$ii" \
+	  test -z "$$ii" \
 	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
 	done
 	@$(NORMAL_UNINSTALL)
@@ -521,10 +527,11 @@ distdir: $(DISTFILES)
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	$(mkinstalldirs) $(distdir)/$(M4DIR)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -632,6 +639,9 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
+$(srcdir)/acinclude.m4: $(ACINCLUDE_INPUTS)
+	cat $(ACINCLUDE_INPUTS) > $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: