Make .h file creation more reliable.

3 files changed, 24 insertions, 7 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index fe0d3096e9..1b46f78c92 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,13 @@
+2003-06-07  Bruno Haible  <bruno@clisp.org>
+
+	* fnmatch.m4 (_AC_LIBOBJ_FNMATCH, gl_FUNC_FNMATCH_POSIX,
+	gl_FUNC_FNMATCH_GNU): Set FNMATCH_H instead of invoking
+	AC_CONFIG_LINKS. Needed to allow for a different name of the lib
+	directory.
+	* poll.m4 (gl_FUNC_POLL): Set POLL_H instead of invoking
+	AC_CONFIG_LINKS. Needed to allow for a different name of the lib
+	directory.
+
 2003-06-04  Paul Eggert  <eggert@twinsun.com>
 
 	* human.m4 (gl_HUMAN): Require AM_STDBOOL_H.  Check for
@@ -1953,7 +1963,7 @@
 2000-02-09  Jim Meyering  <meyering@lucent.com>
 
 	* lib-check.m4 (jm_LIB_CHECK): Fix typo: check for sp_pwdp in
-	struct spwd, rather than in struct passwd.  Reported by Gaël Quéri.
+	struct spwd, rather than in struct passwd.  Reported by Ga� Qu�i.
 
 2000-02-08  Akim Demaille  <akim@epita.fr>
 
@@ -2011,7 +2021,7 @@
 2000-01-28  Jim Meyering  <meyering@lucent.com>
 
 	* perl.m4: Change format of warning message to look more like that
-	from the missing script.  Suggestion from François Pinard.
+	from the missing script.  Suggestion from Fran�is Pinard.
 
 2000-01-25  Jim Meyering  <meyering@lucent.com>
 
diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index ec66a17217..d281d9ef29 100644
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -3,7 +3,7 @@
 # This is a modified version of autoconf's AC_FUNC_FNMATCH.
 # This file should be simplified after Autoconf 2.57 is required.
 
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2000-2003 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -73,7 +73,7 @@ AC_CHECK_DECLS([getenv])
 AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmempcpy])
 AC_CHECK_HEADERS([wchar.h wctype.h])
 AC_LIBOBJ([fnmatch])
-AC_CONFIG_LINKS([lib/fnmatch.h:lib/fnmatch_.h])
+FNMATCH_H=fnmatch.h
 AC_DEFINE(fnmatch, rpl_fnmatch,
           [Define to rpl_fnmatch if the replacement function should be used.])
 ])# _AC_LIBOBJ_FNMATCH
@@ -89,6 +89,7 @@ AC_DEFUN([gl_PREREQ_FNMATCH_EXTRA],
 
 AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
 [
+  FNMATCH_H=
   _AC_FUNC_FNMATCH_IF([POSIX], [ac_cv_func_fnmatch_posix],
                       [rm -f lib/fnmatch.h],
                       [_AC_LIBOBJ_FNMATCH])
@@ -100,6 +101,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX],
     AC_DEFINE([fnmatch], [posix_fnmatch],
       [Define to a replacement function name for fnmatch().])
   fi
+  AC_SUBST([FNMATCH_H])
 ])
 
 
@@ -108,6 +110,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU],
   dnl Persuade glibc <fnmatch.h> to declare FNM_CASEFOLD etc.
   AC_REQUIRE([AC_GNU_SOURCE])
 
+  FNMATCH_H=
   _AC_FUNC_FNMATCH_IF([GNU], [ac_cv_func_fnmatch_gnu],
                       [rm -f lib/fnmatch.h],
                       [_AC_LIBOBJ_FNMATCH])
@@ -119,4 +122,5 @@ AC_DEFUN([gl_FUNC_FNMATCH_GNU],
     AC_DEFINE([fnmatch], [gnu_fnmatch],
       [Define to a replacement function name for fnmatch().])
   fi
+  AC_SUBST([FNMATCH_H])
 ])
diff --git a/m4/poll.m4 b/m4/poll.m4
index a23f504f13..5bfc33c6f1 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -1,4 +1,4 @@
-# poll.m4 serial 1
+# poll.m4 serial 2
 dnl Copyright (c) 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -9,9 +9,12 @@ dnl the same distribution terms as the rest of the program.
 AC_DEFUN([gl_FUNC_POLL],
 [
   AC_CHECK_HEADERS(poll.h)
-  if test x$ac_cv_header_poll_h = xno; then
-    AC_CONFIG_LINKS([lib/poll.h:lib/poll_.h])
+  if test "$ac_cv_header_poll_h" = no; then
+    POLL_H=poll.h
+  else
+    POLL_H=
   fi
+  AC_SUBST([POLL_H])
 
   AC_REPLACE_FUNCS(poll)
   if test $ac_cv_func_poll = no; then