Move some inter-*.m4 includes from configure.in to acinclude.m4 to avoid

2007-11-07  Matthias Clasen <mclasen@redhat.com>

        * 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
This commit is contained in:
Matthias Clasen 2007-11-08 02:43:17 +00:00 committed by Matthias Clasen
parent f36e4a42d8
commit 10de39976c
3 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,10 @@
2007-11-07 Matthias Clasen <mclasen@redhat.com>
* 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 <mclasen@redhat.com> 2007-11-07 Matthias Clasen <mclasen@redhat.com>
=== Branch for 2.14 === === Branch for 2.14 ===

View File

@ -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

View File

@ -7,10 +7,6 @@ dnl *** include special GLib macros ***
dnl *********************************** dnl ***********************************
m4_define(glib_configure_in) 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 # 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 AC_C_BIGENDIAN
# check for header files # 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/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]) AC_CHECK_HEADERS([sys/select.h sys/types.h stdint.h sched.h malloc.h])