Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-138
   Update from CVS

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-139
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-15

1 files changed, 14 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index cd90ee8db0d..0dbff7b166d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 
         * .cvsignore: Add .arch-inventory.
 
+2003-12-24  Andreas Schwab  <schwab@suse.de>
+
+        * configure.in: Check for <sys/socket.h>.  Include it before
+        including <net/if.h>.  Move check for <net/if.h> before it's use.
+
+2003-12-24  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+        * Makefile.in (install-arch-dep): Don't let cd output go into
+        pipe for carbon_appdir.
+
+2003-12-24  Andreas Schwab  <schwab@suse.de>
+
+        * configure.in (PKG_CHECK_MODULES): Fix quoting.
+
 2003-12-01  Andreas Schwab  <schwab@suse.de>
 
         * configure.in (powerpc-apple-darwin*): Use ${CC-cc} instead of