[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: account for moving gnulib files from gnulib to gnu [m4--devo--1.0--
From: |
Gary V. Vaughan |
Subject: |
FYI: account for moving gnulib files from gnulib to gnu [m4--devo--1.0--patch-7] |
Date: |
Fri, 24 Dec 2004 23:06:16 +0000 (GMT) |
User-agent: |
mailnotify/0.6 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
* looking for address@hidden/m4--devo--1.0--patch-6 to compare with
* comparing to address@hidden/m4--devo--1.0--patch-6
M configure.ac
M ChangeLog
M m4/system_.h
M acm4/m4-error.m4
M acm4/m4-obstack.m4
M acm4/m4-regex.m4
* modified files
Index: Changelog
from Eric Blake <address@hidden>
* configure.ac (INCLUDE_STDBOOL_H): Account for gnulib's move
to the gnu subdirectory.
* acm4/m4-error.m4 (INCLUDE_ERROR_H): Likewise.
* acm4/m4-obstack.m4 (INCLUDE_OBSTACK_H): Likewise.
* acm4/m4-regex.m4 (INCLUDE_REGEX_H): Likewise.
* m4/system_.h: Likewise, in non-configured includes.
--- orig/acm4/m4-error.m4
+++ mod/acm4/m4-error.m4
@@ -19,7 +19,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# serial 2
+# serial 3
# m4_ERROR
# --------
@@ -34,7 +34,7 @@
if test $ac_cv_header_error_h = yes; then
INCLUDE_ERROR_H='#include <error.h>'
else
- INCLUDE_ERROR_H='#include <m4/error.h>'
+ INCLUDE_ERROR_H='#include <gnu/error.h>'
fi
AC_SUBST([INCLUDE_ERROR_H])
])# m4_ERROR
--- orig/acm4/m4-obstack.m4
+++ mod/acm4/m4-obstack.m4
@@ -19,13 +19,13 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# serial 8
+# serial 9
# m4_OBSTACK
# ----------
# Use the libc supplied version of obstacks if available.
AC_DEFUN([m4_OBSTACK],
-[AC_PREREQ(2.56)dnl We use the new compiler based header checking in 2.56
+[AC_PREREQ(2.56)dnl We use the compiler based header checking in 2.56
AC_BEFORE([gl_OBSTACK], [m4_OBSTACK])
AC_ARG_WITH([included-obstack],
[AC_HELP_STRING([--with-included-obstack],
@@ -39,16 +39,9 @@
OBSTACK_H=
if test $ac_cv_func_obstack = yes; then
- # The system provides obstack.h, `#include <obstack.h>' will work
INCLUDE_OBSTACK_H='#include <obstack.h>'
else
- # The system does not provide obstack.h, or the user has specified
- # to build without it. Unfortunately we can't leave an obstack.h
- # file around anywhere in the include path if the system also
- # provides an implementation: So we ship gnulib/lib/obstack.h, and link
- # it to m4/obstack.h at Make time (to substitute the missing system
- # supplied version). Hence, `#include <m4/obstack.h>' will work.
- INCLUDE_OBSTACK_H='#include <m4/obstack.h>'
+ INCLUDE_OBSTACK_H='#include <gnu/obstack.h>'
OBSTACK_H=obstack.h
fi
AC_SUBST(OBSTACK_H)
--- orig/acm4/m4-regex.m4
+++ mod/acm4/m4-regex.m4
@@ -19,7 +19,7 @@
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-# serial 2
+# serial 3
# m4_REGEX([path/to/regex.c])
# ---------------------------
@@ -27,17 +27,10 @@
AC_DEFUN([m4_REGEX],
[AC_BEFORE([gl_REGEX], [m4_REGEX])
if test $ac_use_included_regex = no; then
- # The system provides a good regex. `#include <regex.h>' will work.
INCLUDE_REGEX_H='#include <regex.h>'
REGEX_H=
else
- # The system does not provide regex.h, or the user has specified
- # to build without it. Unfortunately we can't leave an regex.h
- # file around anywhere in the include path if the system also
- # provides an implementation: So we ship regex_.h, and link it to
- # m4/regex.h at Make time (to substitute the missing system supplied
- # version). Hence, `#include <m4/regex.h>' will work.
- INCLUDE_REGEX_H='#include <m4/regex.h>'
+ INCLUDE_REGEX_H='#include <gnu/regex.h>'
REGEX_H=regex.h
fi
AC_SUBST(REGEX_H)
--- orig/configure.ac
+++ mod/configure.ac
@@ -178,7 +178,7 @@
if test $ac_cv_header_stdbool_h = yes; then
INCLUDE_STDBOOL_H='#include <stdbool.h>'
else
- INCLUDE_STDBOOL_H='#include <m4/stdbool.h>'
+ INCLUDE_STDBOOL_H='#include <gnu/stdbool.h>'
fi
AC_SUBST([INCLUDE_STDBOOL_H])
--- orig/m4/system_.h
+++ mod/m4/system_.h
@@ -42,9 +42,9 @@
#undef true
@INCLUDE_STDBOOL_H@
-#include <m4/exit.h>
-#include <m4/xalloc.h>
-#include <m4/xstrndup.h>
+#include <gnu/exit.h>
+#include <gnu/xalloc.h>
+#include <gnu/xstrndup.h>
/* This is okay in an installed file, because it will not change the
behaviour of the including program whether ENABLE_NLS is defined
- --
Gary V. Vaughan ())_. address@hidden,gnu.org}
Research Scientist ( '/ http://tkd.kicks-ass.net
GNU Hacker / )= http://www.gnu.org/software/libtool
Technical Author `(_~)_ http://sources.redhat.com/autobook
_________________________________________________________
This patch notification generated by tlaapply version 0.9
http://tkd.kicks-ass.net/arch/address@hidden/cvs-utils--tla--1.0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
iD8DBQFBzKDnFRMICSmD1gYRAgeFAJ0fEOF2/TVetPZBJrAmdSxFVmPUxQCgodCj
gldmBGAr3v06kbajBs4OtyE=
=YafH
-----END PGP SIGNATURE-----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: account for moving gnulib files from gnulib to gnu [m4--devo--1.0--patch-7],
Gary V. Vaughan <=