[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
dependency fixes and old-cruft removal
|
From: |
Paul Eggert |
|
Subject: |
dependency fixes and old-cruft removal |
|
Date: |
Wed, 18 May 2005 12:39:33 -0700 |
|
User-agent: |
Gnus/5.1006 (Gnus v5.10.6) Emacs/21.4 (gnu/linux) |
Partly inspired by the recent fts changes, I installed the following
patch to remove and fix some dependencies and old cruft. Also I added
some copyright notices to modified nontrivial files that lacked them.
This shouldn't affect any behavior.
2005-05-18 Paul Eggert <address@hidden>
* Version 5.3.1.
* configure.ac: Add copyright notice. gl_LIB_CHECK -> cu_LIB_CHECK.
* src/Makefile.am: Add copyright notice.
(factor_LDADD): Remove, as factor no longer needs sqrt.
* src/hostname.c: Remove test for HAVE_LIMITS_H; we can assume
it's always true now.
* lib/canonicalize.c: Include canonicalize.h first, to test interface.
Include <stddef.h> unconditionally, since we assume C89 now.
All uses of PTR_INT_TYPE replaced by ptrdiff_t.
* lib/fts.c: Include fts_.h first, to check interface.
Do not include intprops.h; no longer needed.
Include cycle-check.h and hash.h, since fts_.h no longer does.
Remove unnecessary casts of closedir to void.
(fts_build): Use a simpler method (not involving TYPE_SIGNED) to
decide whether to decrement nlinks.
* lib/fts_.h: Do not include hash.h or cycle-check.h; no longer needed.
(FTS): Use struct hash_table * instead of Hash_table, so that
we no longer need to include hash.h here.
* m4/canonicalize.m4 (AC_FUNC_CANONICALIZE_FILE_NAME]):
Don't check for stddef.h.
* m4/fts.m4 (gl_FUNC_FTS): Don't require AC_HEADER_STDC, as we
don't use its results.
Don't check for fcntl.h, stddef.h, stdlib.h, string.h, unistd.h,
since we include them unconditionally. Don't require
AM_STDBOOL_H, since stdbool is a prerequisite.
Don't require AC_C_CONST, AC_TYPE_SIZE_T or check for ptrdiff_t
since we assume C89 or better.
Don't require AC_FUNC_CLOSEDIR_VOID, AC_FUNC_LSTAT, or AC_FUNC_STAT,
as we don't use their results.
Don't check for fchdir, memmove, memset, strrchr, as we use
them unconditionally.
* m4/gettimeofday.m4 (AC_FUNC_GETTIMEOFDAY_CLOBBER): Don't define
GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER, since nobody uses it.
* m4/jm-macros.m4 (gl_MACROS): Require AC_FUNC_LSTAT.
Don't check for memcpy, strchr, strerror, strrchr, float.h.
Use AC_REQUIRE on AM_LANGINFO_CODESET and gl_GLIBC21 rather
than invoking them directly.
(gl_CHECK_ALL_HEADERS): Don't check for errno.h, float.h,
limits.h, stddef.h, since we assume C89 now.
* m4/lib-check.m4: Add copyright notice.
(cu_LIB_CHECK): Renamed from gl_LIB_CHECK.
Don't check for sqrt; factor no longer needs it.
Revamp tests for floor, modf, rint, to define SEQ_LIBM.
Redo tests for fesetround to act like the other wons.
Use "cu_saved_libs" for local var name, not "ac_su_saved_lib".
* m4/prereq.m4: Add copyright notice.
(gl_PREREQ): Add gl_LOCALCHARSET.
* m4/localcharset.m4: New file, from gnulib.
Index: configure.ac
===================================================================
RCS file: /fetish/cu/configure.ac,v
retrieving revision 1.56
diff -p -u -r1.56 configure.ac
--- configure.ac 5 Apr 2005 11:44:32 -0000 1.56
+++ configure.ac 18 May 2005 19:27:11 -0000
@@ -1,4 +1,24 @@
dnl Process this file with autoconf to produce a configure script. -*-m4-*-
+
+dnl Copyright (C) 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+dnl 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software Foundation,
+dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+dnl Written by Jim Meyering.
+
AC_INIT([GNU coreutils],[5.3.1],address@hidden)
AC_CONFIG_SRCDIR(src/ls.c)
@@ -232,7 +252,7 @@ AC_CHECK_DECLS([strsignal, sys_siglist,
# For src/kill.c and src/printf.c.
AC_CHECK_DECLS([strtoimax, strtoumax])
-gl_LIB_CHECK
+cu_LIB_CHECK
AM_GNU_GETTEXT([external], [need-ngettext])
AM_GNU_GETTEXT_VERSION(0.13.1)
Index: lib/canonicalize.c
===================================================================
RCS file: /fetish/cu/lib/canonicalize.c,v
retrieving revision 1.20
diff -p -u -r1.20 canonicalize.c
--- lib/canonicalize.c 14 May 2005 07:58:06 -0000 1.20
+++ lib/canonicalize.c 18 May 2005 19:27:11 -0000
@@ -20,6 +20,8 @@
# include <config.h>
#endif
+#include "canonicalize.h"
+
#ifdef STDC_HEADERS
# include <stdlib.h>
#else
@@ -43,6 +45,7 @@ void free ();
#endif
#include <errno.h>
+#include <stddef.h>
#include "cycle-check.h"
#include "path-concat.h"
@@ -54,24 +57,6 @@ void free ();
# define __set_errno(Val) errno = (Val)
#endif
-/* If __PTRDIFF_TYPE__ is
- defined, as with GNU C, use that; that way we don't pollute the
- namespace with <stddef.h>'s symbols. Otherwise, if <stddef.h> is
- available, include it and use ptrdiff_t. In traditional C, long is
- the best that we can do. */
-
-#ifdef __PTRDIFF_TYPE__
-# define PTR_INT_TYPE __PTRDIFF_TYPE__
-#else
-# ifdef HAVE_STDDEF_H
-# include <stddef.h>
-# define PTR_INT_TYPE ptrdiff_t
-# else
-# define PTR_INT_TYPE long
-# endif
-#endif
-
-#include "canonicalize.h"
#include "pathmax.h"
#include "xreadlink.h"
@@ -230,7 +215,7 @@ canonicalize_filename_mode (const char *
if (dest + (end - start) >= rpath_limit)
{
- PTR_INT_TYPE dest_offset = dest - rpath;
+ ptrdiff_t dest_offset = dest - rpath;
size_t new_size = rpath_limit - rpath;
if (end - start + 1 > PATH_MAX)
Index: lib/fts.c
===================================================================
RCS file: /fetish/cu/lib/fts.c,v
retrieving revision 1.28
diff -p -u -r1.28 fts.c
--- lib/fts.c 14 May 2005 08:14:47 -0000 1.28
+++ lib/fts.c 18 May 2005 19:27:11 -0000
@@ -53,6 +53,8 @@
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#endif /* LIBC_SCCS and not lint */
+#include "fts_.h"
+
#if HAVE_SYS_PARAM_H || defined _LIBC
# include <sys/param.h>
#endif
@@ -64,9 +66,10 @@ static char sccsid[] = "@(#)fts.c 8.6 (B
#include <fcntl.h>
#include <errno.h>
#include "dirfd.h"
-#include "fts_.h"
-#include "intprops.h"
+#include "cycle-check.h"
+#include "hash.h"
#include "unistd-safer.h"
+#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
@@ -926,7 +929,7 @@ fts_build (register FTS *sp, int type)
cur->fts_flags |= FTS_DONTCHDIR;
descend = false;
cderrno = errno;
- (void)closedir(dirp);
+ closedir(dirp);
dirp = NULL;
} else
descend = true;
@@ -976,7 +979,7 @@ mem1: saved_errno = errno;
if (p)
free(p);
fts_lfree(head);
- (void)closedir(dirp);
+ closedir(dirp);
cur->fts_info = FTS_ERR;
SET(FTS_STOP);
__set_errno (saved_errno);
@@ -1001,7 +1004,7 @@ mem1: saved_errno = errno;
*/
free(p);
fts_lfree(head);
- (void)closedir(dirp);
+ closedir(dirp);
cur->fts_info = FTS_ERR;
SET(FTS_STOP);
__set_errno (ENAMETOOLONG);
@@ -1043,11 +1046,9 @@ mem1: saved_errno = errno;
p->fts_info = fts_stat(sp, p, false);
/* Decrement link count if applicable. */
- if (nlinks > 0
- && (TYPE_SIGNED (nlink_t) || nostat)
- && (p->fts_info == FTS_D ||
+ if (nlinks > 0 && (p->fts_info == FTS_D ||
p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
- --nlinks;
+ nlinks -= nostat;
}
/* We walk in directory order so "ls -f" doesn't get upset. */
@@ -1061,7 +1062,7 @@ mem1: saved_errno = errno;
++nitems;
}
if (dirp)
- (void)closedir(dirp);
+ closedir(dirp);
/*
* If realloc() changed the address of the path, adjust the
Index: lib/fts_.h
===================================================================
RCS file: /fetish/cu/lib/fts_.h,v
retrieving revision 1.14
diff -p -u -r1.14 fts_.h
--- lib/fts_.h 14 May 2005 07:58:06 -0000 1.14
+++ lib/fts_.h 18 May 2005 19:27:11 -0000
@@ -63,8 +63,7 @@
# include <stddef.h>
# include <sys/types.h>
-# include "hash.h"
-# include "cycle-check.h"
+# include <sys/stat.h>
typedef struct {
struct _ftsent *fts_cur; /* current node */
@@ -116,7 +115,7 @@ typedef struct {
and promptly even when the depth of a hierarchy is in the tens
of thousands. Lazy checking, as done by GNU rm via cycle-check.c,
wouldn't be appropriate for du. */
- Hash_table *active_dir_ht;
+ struct hash_table *active_dir_ht;
struct cycle_check_state *cycle_state;
} FTS;
Index: m4/canonicalize.m4
===================================================================
RCS file: /fetish/cu/m4/canonicalize.m4,v
retrieving revision 1.8
diff -p -u -r1.8 canonicalize.m4
--- m4/canonicalize.m4 28 Apr 2005 16:55:43 -0000 1.8
+++ m4/canonicalize.m4 18 May 2005 19:27:11 -0000
@@ -1,4 +1,4 @@
-#serial 7
+#serial 8
# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -13,6 +13,6 @@ AC_DEFUN([AC_FUNC_CANONICALIZE_FILE_NAME
AC_LIBOBJ([canonicalize])
AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS(string.h sys/param.h stddef.h)
+ AC_CHECK_HEADERS(string.h sys/param.h)
AC_CHECK_FUNCS(resolvepath canonicalize_file_name)
])
Index: m4/fts.m4
===================================================================
RCS file: /fetish/cu/m4/fts.m4,v
retrieving revision 1.4
diff -p -u -r1.4 fts.m4
--- m4/fts.m4 16 May 2005 13:10:53 -0000 1.4
+++ m4/fts.m4 18 May 2005 19:27:11 -0000
@@ -1,4 +1,4 @@
-#serial 2
+#serial 3
dnl Copyright (C) 2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -16,21 +16,12 @@ AC_DEFUN([gl_FUNC_FTS],
# Checks for header files.
AC_REQUIRE([AC_HEADER_DIRENT])
- AC_REQUIRE([AC_HEADER_STDC])
- AC_CHECK_HEADERS_ONCE([fcntl.h inttypes.h stddef.h stdint.h])
- AC_CHECK_HEADERS_ONCE([stdlib.h string.h sys/param.h unistd.h])
+ AC_CHECK_HEADERS_ONCE([inttypes.h stdint.h])
+ AC_CHECK_HEADERS_ONCE([sys/param.h])
# Checks for typedefs, structures, and compiler characteristics.
- AC_REQUIRE([AM_STDBOOL_H])
- AC_REQUIRE([AC_C_CONST])
- AC_REQUIRE([AC_TYPE_SIZE_T])
AC_REQUIRE([gt_INTTYPES_PRI])
- AC_CHECK_TYPES([ptrdiff_t])
# Checks for library functions.
- AC_REQUIRE([AC_FUNC_CLOSEDIR_VOID])
- AC_REQUIRE([AC_FUNC_LSTAT])
AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
- AC_REQUIRE([AC_FUNC_STAT])
- AC_CHECK_FUNCS_ONCE([fchdir memmove memset strrchr])
])
Index: m4/gettimeofday.m4
===================================================================
RCS file: /fetish/cu/m4/gettimeofday.m4,v
retrieving revision 1.9
diff -p -u -r1.9 gettimeofday.m4
--- m4/gettimeofday.m4 23 Jan 2005 09:07:57 -0000 1.9
+++ m4/gettimeofday.m4 18 May 2005 19:27:11 -0000
@@ -1,6 +1,6 @@
-#serial 6
+#serial 7
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -62,8 +62,6 @@ main ()
AC_DEFINE(gettimeofday, rpl_gettimeofday,
[Define to rpl_gettimeofday if the replacement function should be used.])
- AC_DEFINE(GETTIMEOFDAY_CLOBBERS_LOCALTIME_BUFFER, 1,
- [Define if gettimeofday clobbers localtime's static buffer.])
gl_PREREQ_GETTIMEOFDAY
fi
])
Index: m4/jm-macros.m4
===================================================================
RCS file: /fetish/cu/m4/jm-macros.m4,v
retrieving revision 1.215
diff -p -u -r1.215 jm-macros.m4
--- m4/jm-macros.m4 14 May 2005 07:58:31 -0000 1.215
+++ m4/jm-macros.m4 18 May 2005 19:27:11 -0000
@@ -1,4 +1,4 @@
-#serial 86 -*- autoconf -*-
+#serial 87 -*- autoconf -*-
dnl Misc type-related macros for coreutils.
@@ -54,6 +54,7 @@ AC_DEFUN([gl_MACROS],
AC_REQUIRE([gl_FUNC_LCHOWN])
AC_REQUIRE([gl_FUNC_RMDIR_NOTEMPTY])
AC_REQUIRE([gl_FUNC_CHOWN])
+ AC_REQUIRE([AC_FUNC_LSTAT])
AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
AC_REQUIRE([AC_FUNC_STRERROR_R])
AC_REQUIRE([gl_FUNC_GROUP_MEMBER])
@@ -109,16 +110,12 @@ AC_DEFUN([gl_MACROS],
iswspace \
lchown \
listmntent \
- memcpy \
mempcpy \
mkfifo \
mbrlen \
realpath \
sethostname \
siginterrupt \
- strchr \
- strerror \
- strrchr \
sysctl \
sysinfo \
tcgetpgrp \
@@ -157,8 +154,8 @@ AC_DEFUN([gl_MACROS],
LIBS="$ac_seq_save_LIBS"
])
- AM_LANGINFO_CODESET
- gl_GLIBC21
+ AC_REQUIRE([AM_LANGINFO_CODESET])
+ AC_REQUIRE([gl_GLIBC21])
AM_ICONV
gl_FUNC_UNLINK_BUSY_TEXT
@@ -185,18 +182,14 @@ AC_DEFUN([gl_MACROS],
AC_DEFUN([gl_CHECK_ALL_HEADERS],
[
AC_CHECK_HEADERS_ONCE( \
- errno.h \
fcntl.h \
- float.h \
hurd.h \
- limits.h \
memory.h \
mntent.h \
mnttab.h \
netdb.h \
paths.h \
stdlib.h \
- stddef.h \
stdint.h \
string.h \
sys/filsys.h \
Index: m4/lib-check.m4
===================================================================
RCS file: /fetish/cu/m4/lib-check.m4,v
retrieving revision 1.11
diff -p -u -r1.11 lib-check.m4
--- m4/lib-check.m4 13 Apr 2004 15:28:45 -0000 1.11
+++ m4/lib-check.m4 18 May 2005 19:27:11 -0000
@@ -1,8 +1,27 @@
-#serial 7
+#serial 8
-dnl Misc lib-related macros for fileutils, sh-utils, textutils.
+dnl Misc lib-related macros for coreutils.
-AC_DEFUN([gl_LIB_CHECK],
+# Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004,
+# 2005 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Written by Jim Meyering.
+
+AC_DEFUN([cu_LIB_CHECK],
[
# Check for libypsec.a on Dolphin M88K machines.
@@ -13,26 +32,24 @@ AC_DEFUN([gl_LIB_CHECK],
# Some programs need to link with -lm. printf does if it uses
# lib/strtod.c which uses pow. And seq uses the math functions,
- # floor, modf, rint. And factor uses sqrt. And sleep uses fesetround.
+ # floor, modf, rint. And sleep uses fesetround.
- # Save a copy of $LIBS and add $FLOOR_LIBM before these tests
# Check for these math functions used by seq.
- ac_su_saved_lib="$LIBS"
- LIBS="$LIBS -lm"
- AC_CHECK_FUNCS(floor modf rint)
- LIBS="$ac_su_saved_lib"
-
- AC_SUBST(SQRT_LIBM)
- AC_CHECK_FUNCS(sqrt)
- if test $ac_cv_func_sqrt = no; then
- AC_CHECK_LIB(m, sqrt, [SQRT_LIBM=-lm])
- fi
+ AC_SUBST([SEQ_LIBM])
+ cu_saved_libs=$LIBS
+ AC_SEARCH_LIBS([floor], [m])
+ AC_SEARCH_LIBS([modf], [m])
+ AC_SEARCH_LIBS([rint], [m])
+ AC_CHECK_FUNCS([floor modf rint])
+ test "X$LIBS" = "X$cu_saved_libs" || SEQ_LIBM=-lm
+ LIBS=$cu_saved_libs
AC_SUBST(FESETROUND_LIBM)
- AC_CHECK_FUNCS(fesetround)
- if test $ac_cv_func_fesetround = no; then
- AC_CHECK_LIB(m, fesetround, [FESETROUND_LIBM=-lm])
- fi
+ cu_saved_libs=$LIBS
+ AC_SEARCH_LIBS([fesetround], [m])
+ AC_CHECK_FUNCS([fesetround])
+ test "X$LIBS" = "X$cu_saved_libs" || FESETROUND_LIBM=-lm
+ LIBS=$cu_saved_libs
# The -lsun library is required for YP support on Irix-4.0.5 systems.
# m88k/svr3 DolphinOS systems using YP need -lypsec for id.
@@ -56,10 +73,10 @@ $ac_includes_default
# SCO-ODT-3.0 is reported to need -lufc for crypt.
# NetBSD needs -lcrypt for crypt.
- ac_su_saved_lib="$LIBS"
+ cu_saved_libs="$LIBS"
AC_SEARCH_LIBS(crypt, [ufc crypt],
[test "$ac_cv_search_crypt" = "none required" ||
LIB_CRYPT="$ac_cv_search_crypt"])
- LIBS="$ac_su_saved_lib"
+ LIBS="$cu_saved_libs"
AC_SUBST(LIB_CRYPT)
])
Index: m4/prereq.m4
===================================================================
RCS file: /fetish/cu/m4/prereq.m4,v
retrieving revision 1.111
diff -p -u -r1.111 prereq.m4
--- m4/prereq.m4 14 May 2005 08:11:32 -0000 1.111
+++ m4/prereq.m4 18 May 2005 19:27:11 -0000
@@ -1,4 +1,4 @@
-#serial 54
+#serial 55
dnl We use gl_ for non Autoconf macros.
m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl
@@ -6,6 +6,26 @@ m4_pattern_forbid([^gl_[ABCDEFGHIJKLMNOP
# These are the prerequisite macros for files in the lib/
# directory of the coreutils package.
+
+# Copyright (C) 1998 2000, 2001, 2003, 2004, 2005 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Written by Jim Meyering.
+
+
AC_DEFUN([gl_PREREQ],
[
# We don't yet use c-stack.c.
@@ -82,6 +102,7 @@ AC_DEFUN([gl_PREREQ],
AC_REQUIRE([gl_IDCACHE])
AC_REQUIRE([gl_INTTOSTR])
AC_REQUIRE([gl_LINEBUFFER])
+ AC_REQUIRE([gl_LOCALCHARSET])
AC_REQUIRE([gl_LONG_OPTIONS])
AC_REQUIRE([gl_MAKEPATH])
AC_REQUIRE([gl_MBSWIDTH])
Index: src/Makefile.am
===================================================================
RCS file: /fetish/cu/src/Makefile.am,v
retrieving revision 1.55
diff -p -u -r1.55 Makefile.am
--- src/Makefile.am 18 Apr 2005 23:32:49 -0000 1.55
+++ src/Makefile.am 18 May 2005 19:27:11 -0000
@@ -1,5 +1,22 @@
## Process this file with automake to produce Makefile.in -*-Makefile-*-
+## Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+## 2000, 2001, 2002, 2003, 2004, 2005 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
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software Foundation,
+## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
EXTRA_PROGRAMS = chroot df hostid nice pinky stty su uname uptime users who
bin_SCRIPTS = groups
@@ -57,9 +74,6 @@ sort_LDADD = $(LDADD) $(POW_LIB)
date_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
touch_LDADD = $(LDADD) $(LIB_CLOCK_GETTIME)
-# For sqrt
-factor_LDADD = $(LDADD) $(SQRT_LIBM)
-
# If necessary, add -lm to resolve use of pow in lib/strtod.c.
# If necessary, add -liconv to resolve use of iconv in lib/unicodeio.c.
printf_LDADD = $(LDADD) $(POW_LIB) $(LIBICONV)
Index: src/hostname.c
===================================================================
RCS file: /fetish/cu/src/hostname.c,v
retrieving revision 1.57
diff -p -u -r1.57 hostname.c
--- src/hostname.c 14 May 2005 07:58:37 -0000 1.57
+++ src/hostname.c 18 May 2005 19:27:11 -0000
@@ -1,5 +1,5 @@
/* hostname - set or print the name of current host system
- Copyright (C) 1994-1997, 1999-2004 Free Software Foundation, Inc.
+ Copyright (C) 1994-1997, 1999-2005 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
@@ -38,7 +38,7 @@ int sethostname ();
#endif
#if !defined(HAVE_SETHOSTNAME) && defined(HAVE_SYSINFO) && \
- defined (HAVE_SYS_SYSTEMINFO_H) && defined(HAVE_LIMITS_H)
+ defined (HAVE_SYS_SYSTEMINFO_H)
# include <sys/systeminfo.h>
int
--- /dev/null 2003-03-18 13:55:57 -0800
+++ m4/localcharset.m4 2005-05-18 12:01:15 -0700
@@ -0,0 +1,17 @@
+# localcharset.m4 serial 2
+dnl Copyright (C) 2002 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.
+
+AC_DEFUN([gl_LOCALCHARSET],
+[
+ dnl Prerequisites of lib/localcharset.c.
+ AC_CHECK_HEADERS_ONCE(stddef.h stdlib.h string.h)
+ AC_REQUIRE([AM_LANGINFO_CODESET])
+ AC_CHECK_FUNCS_ONCE(setlocale)
+
+ dnl Prerequisites of the lib/Makefile.am snippet.
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_REQUIRE([gl_GLIBC21])
+])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- dependency fixes and old-cruft removal,
Paul Eggert <=