This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[committed] convert intl to autoconf 2.57


Tested on i686-pc-linux-gnu, plus various hand checks that behavior
hasn't meaningfully changed.  Committed.

	* configure.in: Convert to autoconf 2.57, gratuitous stylistic
	cleanup, rename to configure.ac.
	* configure.ac: Renamed from configure.in.
	* config.h.in: Rebuilt with autoheader 2.57.
	* configure: Rebuilt with autoconf 2.57
	* README: Update to reflect rename of configure.in to configure.ac.

Index: README
===================================================================
RCS file: /cvs/gcc/gcc/intl/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- README	8 Jul 2003 05:55:11 -0000	1.2
+++ README	29 Feb 2004 20:11:34 -0000
@@ -18,6 +18,6 @@
   "gettextize" from the files that gettext 0.12.1 installs in
   $(prefix)/share/aclocal.
 
-* configure.in, config.intl.in, and Makefile.in were written for this
+* configure.ac, config.intl.in, and Makefile.in were written for this
   directory layout, by Zack Weinberg <zack@codesourcery.com>.  Please
   direct patches for these files to gcc-patches@gcc.gnu.org.
Index: configure.ac
===================================================================
RCS file: configure.ac
diff -N configure.ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ configure.ac	29 Feb 2004 20:11:41 -0000
@@ -0,0 +1,33 @@
+AC_PREREQ(2.57)
+AC_INIT
+AC_CONFIG_SRCDIR(gettext.c)
+AC_CONFIG_HEADER(config.h)
+AM_GNU_GETTEXT_VERSION(0.12.1)
+AM_GNU_GETTEXT
+
+# This replaces the extensive use of DEFS in the original Makefile.in.
+AC_DEFINE(IN_LIBINTL, 1, [Define because this is libintl.])
+AC_DEFINE(IN_LIBRARY, 1, [Define because this is a library.])
+AC_DEFINE(DEPENDS_ON_LIBICONV, 1, [Define because we depend on libiconv.])
+AC_DEFINE(ENABLE_RELOCATABLE, 1, [Define to enable relocation.])
+AC_DEFINE(NO_XMALLOC, 1, [Define if there is no xmalloc.])
+AC_DEFINE(set_relocation_prefix, libintl_set_relocation_prefix,
+[Define this entry point correctly.])
+AC_DEFINE(relocate, libintl_relocate,
+[Define this entry point correctly.])
+
+# Additional info for config.intl.
+AC_SUBST(LIBINTL_DEP)
+AC_SUBST(INCINTL)
+
+LIBINTL_DEP=
+INCINTL=
+case $USE_INCLUDED_LIBINTL in
+  yes)
+    LIBINTL_DEP='${top_builddir}/intl/libintl.a'
+    INCINTL='-I${top_builddir}/intl'
+    ;;
+esac
+
+AC_CONFIG_FILES(Makefile config.intl)
+AC_OUTPUT
Index: configure.in
===================================================================
RCS file: configure.in
diff -N configure.in
--- configure.in	8 Jul 2003 05:55:11 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-AC_PREREQ(2.13)
-AC_INIT(gettext.c)
-AC_CONFIG_HEADER(config.h)
-AM_GNU_GETTEXT_VERSION(0.12.1)
-AM_GNU_GETTEXT
-
-dnl This replaces the extensive use of DEFS in the original Makefile.in.
-AC_DEFINE(IN_LIBINTL, 1, [Define because this is libintl.])
-AC_DEFINE(IN_LIBRARY, 1, [Define because this is a library.])
-AC_DEFINE(DEPENDS_ON_LIBICONV, 1, [Define because we depend on libiconv.])
-AC_DEFINE(ENABLE_RELOCATABLE, 1, [Define to enable relocation.])
-AC_DEFINE(NO_XMALLOC, 1, [Define if there is no xmalloc.])
-AC_DEFINE(set_relocation_prefix, libintl_set_relocation_prefix,
-[Define this entry point correctly.])
-AC_DEFINE(relocate, libintl_relocate,
-[Define this entry point correctly.])
-
-dnl Additional info for config.intl.
-LIBINTL_DEP=   AC_SUBST(LIBINTL_DEP)
-INCINTL=       AC_SUBST(INCINTL)
-
-if test $USE_INCLUDED_LIBINTL = yes; then
-  LIBINTL_DEP='${top_builddir}/intl/libintl.a'
-  INCINTL='-I${top_builddir}/intl'
-fi
-
-AC_OUTPUT(Makefile config.intl)

-- 
Nathanael Nerode  <neroden at gcc.gnu.org>
US citizens: if you're considering voting for Bush, look at these first:
http://www.misleader.org/  http://www.cbc.ca/news/background/arar/
http://www.house.gov/reform/min/politicsandscience/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]