make glob.h self-contained

[Bruno Haible]

The generated glob.h should be as self-contained as possible.

2007-05-01  Bruno Haible  <address@hidden>

        * lib/glob_.h: Test HAVE_SYS_CDEFS_H at configure time.
        * m4/glob.m4 (gl_PREREQ_GLOB): Substitute HAVE_SYS_CDEFS_H via AC_SUBST.
        * modules/glob (Makefile.am): Put HAVE_SYS_CDEFS_H value into glob.h.

*** lib/glob_.h 30 Mar 2007 23:56:06 -0000      1.9
--- lib/glob_.h 1 May 2007 15:44:23 -0000
***************
*** 21,27 ****
  #ifndef _GL_GLOB_H
  #define _GL_GLOB_H
  
! #ifdef HAVE_SYS_CDEFS_H
  # include <sys/cdefs.h>
  #endif
  
--- 21,27 ----
  #ifndef _GL_GLOB_H
  #define _GL_GLOB_H
  
! #if @HAVE_SYS_CDEFS_H@
  # include <sys/cdefs.h>
  #endif
  
*** m4/glob.m4  21 Aug 2006 21:46:31 -0000      1.10
--- m4/glob.m4  1 May 2007 15:44:23 -0000
***************
*** 1,5 ****
! # glob.m4 serial 7
! dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
--- 1,5 ----
! # glob.m4 serial 8
! dnl Copyright (C) 2005-2007 Free Software Foundation, Inc.
  dnl This file is free software; the Free Software Foundation
  dnl gives unlimited permission to copy and/or distribute it,
  dnl with or without modifications, as long as this notice is preserved.
***************
*** 71,79 ****
  
  # Prerequisites of lib/glob.*.
  AC_DEFUN([gl_PREREQ_GLOB],
! [ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
    AC_REQUIRE([AC_C_RESTRICT])dnl
    AC_REQUIRE([AC_GNU_SOURCE])dnl
    AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
    AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
!   :])
--- 71,86 ----
  
  # Prerequisites of lib/glob.*.
  AC_DEFUN([gl_PREREQ_GLOB],
! [
!   AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
    AC_REQUIRE([AC_C_RESTRICT])dnl
    AC_REQUIRE([AC_GNU_SOURCE])dnl
    AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
    AC_CHECK_FUNCS_ONCE([getlogin_r getpwnam_r])dnl
!   if test $ac_cv_header_sys_cdefs_h = yes; then
!     HAVE_SYS_CDEFS_H=1
!   else
!     HAVE_SYS_CDEFS_H=0
!   fi
!   AC_SUBST([HAVE_SYS_CDEFS_H])
! ])
*** modules/glob        27 Oct 2006 20:46:43 -0000      1.14
--- modules/glob        1 May 2007 15:44:23 -0000
***************
*** 30,36 ****
  # doesn't have one that works with the given compiler.
  glob.h: glob_.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
!         cat $(srcdir)/glob_.h; \
        } > address@hidden
        mv -f address@hidden $@
  MOSTLYCLEANFILES += glob.h glob.h-t
--- 30,37 ----
  # doesn't have one that works with the given compiler.
  glob.h: glob_.h
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
!         sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
!             < $(srcdir)/glob_.h; \
        } > address@hidden
        mv -f address@hidden $@
  MOSTLYCLEANFILES += glob.h glob.h-t