Upgrade to autoconf 2.13. Make acconfig.h as small as possible.

5 files changed, 27 insertions, 41 deletions

diff --git a/ChangeLog b/ChangeLog
index c682cc0..c0c916d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2001-01-20  Bruno Haible  <haible@clisp.cons.org>
+
+	* configure.in: Add a third argument to AC_DEFINE.
+	Require autoconf-2.13.
+	* acconfig.h (_GNU_SOURCE): Remove, now done in configure.in.
+	(HAVE_PARSE_PRINTF_FORMAT): Likewise.
+	(ENABLE_NLS): Remove, now done in m4/gettext.m4.
+	(HAVE_GETTEXT): Likewise.
+	(HAVE_STPCPY): Likewise.
+	(HAVE_LC_MESSAGES): Remove, now done in m4/lcmessage.m4.
+	(HAVE_PTRDIFF_T): Remove, now done in automake-1.4's ptrdiff.m4.
+	(HAVE_OBSTACK): Remove, not set by configure.
+	(HAVE_CATGETS): Likewise.
+
 2001-01-07  Bruno Haible  <haible@clisp.cons.org>
 
 	* Makefile.am (DISTCLEANFILES): Remove. Now done in intl/Makefile.in.
diff --git a/acconfig.h b/acconfig.h
index e3fd778..2de2b9e 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -15,39 +15,12 @@
 
 @TOP@
 
-/* Make sure we see all GNU extensions.  */
-#undef _GNU_SOURCE
-
 /* Define to the name of the distribution.  */
 #undef PACKAGE
 
 /* Define to the version of the distribution.  */
 #undef VERSION
 
-/* Define if you have obstacks.  */
-#undef HAVE_OBSTACK
-
-/* Define if <stddef.h> defines ptrdiff_t.  */
-#undef HAVE_PTRDIFF_T
-
-/* Define if your locale.h file contains LC_MESSAGES.  */
-#undef HAVE_LC_MESSAGES
-
-/* Define if you have the parse_printf_format function.  */
-#undef HAVE_PARSE_PRINTF_FORMAT
-
-/* Define to 1 if NLS is requested.  */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have catgets and don't want to use GNU gettext.  */
-#undef HAVE_CATGETS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext.  */
-#undef HAVE_GETTEXT
-
-/* Define as 1 if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
 @BOTTOM@
 
 /* We don't test for the basename function but still want to use the
@@ -56,11 +29,6 @@
 # define HAVE_BASENAME	1
 #endif
 
-/* On GNU systems we want to use the extensions.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE	1
-#endif
-
 
 /* A file name cannot consist of any character possible.  INVALID_PATH_CHAR
    contains the characters not allowed.  */
diff --git a/configure.in b/configure.in
index 9f72dd3..8abd702 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.12)
-AC_REVISION($Revision: 1.7 $)
+AC_PREREQ(2.13)
+AC_REVISION($Revision: 1.8 $)
 AC_INIT(src/msgfmt.c)
 AM_INIT_AUTOMAKE(gettext, 0.10.36)
 AM_CONFIG_HEADER(config.h)
@@ -15,8 +15,7 @@ AC_ISC_POSIX
 AC_PROG_INSTALL
 AC_PROG_YACC
 
-dnl Make sure we see all GNU extensions.
-AC_DEFINE(_GNU_SOURCE)
+AC_DEFINE(_GNU_SOURCE, 1, [Make sure we see all GNU extensions.])
 
 dnl Checks for libraries.
 
@@ -47,7 +46,8 @@ fi
 AC_CHECK_FUNC(parse_printf_format, gt_cv_func_parse_printf_format=yes,
   gt_cv_func_parse_printf_format=no)
 if test $gt_cv_func_parse_printf_format = yes; then
-  AC_DEFINE(HAVE_PARSE_PRINTF_FORMAT)
+  AC_DEFINE(HAVE_PARSE_PRINTF_FORMAT, 1,
+    [Define if you have the parse_printf_format() function.])
 else
   LIBOBJS="$LIBOBJS printf-prs.o"
 fi
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 64759be..6edd7fa 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -41,7 +41,9 @@ AC_DEFUN(AM_WITH_NLS,
 
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS)
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -81,7 +83,8 @@ return (int) gettext ("") + _nl_msg_cat_cntr],
 
 	   if test "$gt_cv_func_gnugettext_libc" = "yes" \
 	      || test "$gt_cv_func_gnugettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT)
+	      AC_DEFINE(HAVE_GETTEXT, 1,
+                [Define if the GNU gettext() function is already present or preinstalled.])
 	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
 		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
 	      if test "$MSGFMT" != "no"; then
diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index e31bb53..0a354f7 100644
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -6,7 +6,7 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 1
+# serial 2
 
 AC_DEFUN(AM_LC_MESSAGES,
   [if test $ac_cv_header_locale_h = yes; then
@@ -14,6 +14,7 @@ AC_DEFUN(AM_LC_MESSAGES,
       [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
     if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES)
+      AC_DEFINE(HAVE_LC_MESSAGES, 1,
+        [Define if your <locale.h> file defines LC_MESSAGES.])
     fi
   fi])