From 10de39976c7761f3440de6ca7360b16005543df8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 8 Nov 2007 02:43:17 +0000 Subject: [PATCH] Move some inter-*.m4 includes from configure.in to acinclude.m4 to avoid 2007-11-07 Matthias Clasen * acinclude.m4: * configure.in: Move some inter-*.m4 includes from configure.in to acinclude.m4 to avoid warnings when using automake 1.9. (#449937) svn path=/trunk/; revision=5812 --- ChangeLog | 7 +++++++ acinclude.m4 | 4 ++++ configure.in | 6 +----- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01fe0e8..b03a86c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ 2007-11-07 Matthias Clasen + * acinclude.m4: + * configure.in: Move some inter-*.m4 includes from + configure.in to acinclude.m4 to avoid warnings when + using automake 1.9. (#449937) + +2007-11-07 Matthias Clasen + === Branch for 2.14 === diff --git a/acinclude.m4 b/acinclude.m4 index f86034d..cac7f21 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -446,3 +446,7 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H], ]) +m4_include(acglib.m4)dnl +m4_include(glib/libcharset/codeset.m4)dnl +m4_include(glib/libcharset/glibc21.m4)dnl +m4_include(m4macros/glib-gettext.m4)dnl diff --git a/configure.in b/configure.in index 6608923..e1353c2 100644 --- a/configure.in +++ b/configure.in @@ -7,10 +7,6 @@ dnl *** include special GLib macros *** dnl *********************************** m4_define(glib_configure_in) -m4_include(acglib.m4)dnl -m4_include(glib/libcharset/codeset.m4)dnl -m4_include(glib/libcharset/glibc21.m4)dnl -m4_include(m4macros/glib-gettext.m4)dnl # # The following version number definitions apply to GLib, GModule, GObject @@ -813,7 +809,7 @@ AM_CONDITIONAL(HAVE_SUNSTUDIO_VISIBILITY, [test x$g_have_sunstudio_visibility = AC_C_BIGENDIAN # check for header files -AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h sys/param.h sys/poll.h]) +AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h sys/param.h sys/poll.h sys/resource.h]) AC_CHECK_HEADERS([sys/time.h sys/times.h sys/wait.h unistd.h values.h]) AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h sched.h malloc.h]) -- 2.7.4