[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109286: Remove some empty src/s file
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109286: Remove some empty src/s files. |
Date: |
Sun, 29 Jul 2012 23:18:28 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109286
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-29 23:18:28 -0700
message:
Remove some empty src/s files.
* configure.ac (opsysfile): Set to empty on freebsd, gnu-linux,
gnu-kfreebsd; and to usg5-4-common.h on sol2*, unixware.
* src/s/freebsd.h, src/s/gnu-linux.h, src/s/sol2-6.h, src/s/unixware.h:
Remove empty files.
removed:
src/s/freebsd.h
src/s/gnu-linux.h
src/s/sol2-6.h
src/s/unixware.h
modified:
ChangeLog
configure.ac
src/ChangeLog
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-30 06:07:22 +0000
+++ b/ChangeLog 2012-07-30 06:18:28 +0000
@@ -1,3 +1,8 @@
+2012-07-30 Glenn Morris <address@hidden>
+
+ * configure.ac (opsysfile): Set to empty on freebsd, gnu-linux,
+ gnu-kfreebsd; and to usg5-4-common.h on sol2*, unixware.
+
2012-07-30 Paul Eggert <address@hidden>
Merge from gnulib, incorporating:
=== modified file 'configure.ac'
--- a/configure.ac 2012-07-28 23:05:32 +0000
+++ b/configure.ac 2012-07-30 06:18:28 +0000
@@ -3677,6 +3677,7 @@
;;
freebsd)
+ opsysfile=
AC_DEFINE(BSD4_2, [])
dnl Hack to avoid calling AC_PREPROC_IFELSE multiple times.
dnl Would not be needed with autoconf >= 2.67, where the
@@ -3694,6 +3695,7 @@
;;
gnu-linux | gnu-kfreebsd )
+ opsysfile=
AC_DEFINE(USG, [])
AC_DEFINE(GNU_LINUX, [], [Define if ths system is compatible with
GNU/Linux.])
;;
@@ -3711,12 +3713,14 @@
;;
sol2*)
+ opsysfile="s/usg5-4-common.h"
AC_DEFINE(USG, [])
AC_DEFINE(USG5, [])
AC_DEFINE(SOLARIS2, [], [Define if the system is Solaris.])
;;
unixware)
+ opsysfile="s/usg5-4-common.h"
AC_DEFINE(USG, [])
AC_DEFINE(USG5, [])
;;
@@ -3736,8 +3740,6 @@
gnu) opsysfile= ;;
- gnu-kfreebsd) opsysfile="s/gnu-linux.h" ;;
-
hpux11)
dnl See comments in sysdep.c:sys_signal.
dnl SA_RESTART resets the timeout of `select' on hpux11.
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-30 05:41:10 +0000
+++ b/src/ChangeLog 2012-07-30 06:18:28 +0000
@@ -1,3 +1,8 @@
+2012-07-30 Glenn Morris <address@hidden>
+
+ * s/freebsd.h, s/gnu-linux.h, s/sol2-6.h, s/unixware.h:
+ Remove empty files.
+
2012-07-30 Paul Eggert <address@hidden>
Export to GDB most of lisp.h's remaining object-like macros.
=== removed file 'src/s/freebsd.h'
--- a/src/s/freebsd.h 2012-07-14 00:04:10 +0000
+++ b/src/s/freebsd.h 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/* System description header for FreeBSD systems.
-
-Copyright (C) 1994-2012 Free Software Foundation, Inc.
-
-Author: Shawn M. Carey
-(according to authors.el)
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
=== removed file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-07-14 00:04:10 +0000
+++ b/src/s/gnu-linux.h 1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/* This file is the configuration file for Linux-based GNU systems
-
-Copyright (C) 1985-1986, 1992, 1994, 1996, 1999, 2001-2012
- Free Software Foundation, Inc.
-
-This file was put together by Michael K. Johnson and Rik Faith.
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
=== removed file 'src/s/sol2-6.h'
--- a/src/s/sol2-6.h 2012-07-14 00:04:10 +0000
+++ b/src/s/sol2-6.h 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-/* Definitions file for GNU Emacs running on Solaris 2.6.
-
-Copyright (C) 1999-2012 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-#include "usg5-4-common.h"
-
=== removed file 'src/s/unixware.h'
--- a/src/s/unixware.h 2012-07-14 00:04:10 +0000
+++ b/src/s/unixware.h 1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-/* s/ file for Unixware.
-
-Copyright (C) 1999-2012 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs 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 3 of the License, or
-(at your option) any later version.
-
-GNU Emacs 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 GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-#include "usg5-4-common.h"
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109286: Remove some empty src/s files.,
Glenn Morris <=