Rename netinet_in_.h to netinet_in.in.h.

diff --git a/ChangeLog b/ChangeLog
index c0f678fae3e864a648f0a0310339428953a1f305..3c8e7c2585d74d5fc51b7d99348a99de5079f330 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
        locale_.h.
        * lib/math.in.h: Renamed from lib/math_.h.
        * modules/math (Files, Makefile.am): Use math.in.h instead of math_.h.
+       * lib/netinet_in.in.h: Renamed from lib/netinet_in_.h.
+       * modules/netinet_in (Files, Makefile.am): Use netinet_in.in.h instead
+       of netinet_in_.h. Add dependency.
 
 2007-09-30  Bruno Haible  <bruno@clisp.org>
 

diff --git a/lib/netinet_in.in.h b/lib/netinet_in.in.h
new file mode 100644 (file)
index 0000000..aa00e45
--- /dev/null
+++ b/lib/netinet_in.in.h
@@ -0,0 +1,43 @@
+/* Substitute for <netinet/in.h>.
+   Copyright (C) 2007 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.  */
+
+#ifndef _GL_NETINET_IN_H
+
+#if @HAVE_NETINET_IN_H@
+
+/* On many platforms, <netinet/in.h> assumes prior inclusion of
+   <sys/types.h>.  */
+# include <sys/types.h>
+
+/* The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_NETINET_IN_H@
+
+#endif
+
+#ifndef _GL_NETINET_IN_H
+#define _GL_NETINET_IN_H
+
+#if !@HAVE_NETINET_IN_H@
+
+/* A platform that lacks <netinet/in.h>.  */
+
+# include <sys/socket.h>
+
+#endif
+
+#endif /* _GL_NETINET_IN_H */
+#endif /* _GL_NETINET_IN_H */

diff --git a/lib/netinet_in_.h b/lib/netinet_in_.h
deleted file mode 100644 (file)
index aa00e45..0000000
--- a/lib/netinet_in_.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Substitute for <netinet/in.h>.
-   Copyright (C) 2007 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.  */
-
-#ifndef _GL_NETINET_IN_H
-
-#if @HAVE_NETINET_IN_H@
-
-/* On many platforms, <netinet/in.h> assumes prior inclusion of
-   <sys/types.h>.  */
-# include <sys/types.h>
-
-/* The include_next requires a split double-inclusion guard.  */
-# @INCLUDE_NEXT@ @NEXT_NETINET_IN_H@
-
-#endif
-
-#ifndef _GL_NETINET_IN_H
-#define _GL_NETINET_IN_H
-
-#if !@HAVE_NETINET_IN_H@
-
-/* A platform that lacks <netinet/in.h>.  */
-
-# include <sys/socket.h>
-
-#endif
-
-#endif /* _GL_NETINET_IN_H */
-#endif /* _GL_NETINET_IN_H */

diff --git a/modules/netinet_in b/modules/netinet_in
index c3fb3aeff75971b8c905ffca734310805907f218..149b8c77d322bf2642ab6b30723c57ad7ccab373 100644 (file)
--- a/modules/netinet_in
+++ b/modules/netinet_in
@@ -2,7 +2,7 @@ Description:
 A <netinet/in.h> for systems lacking it.
 
 Files:
-lib/netinet_in_.h
+lib/netinet_in.in.h
 m4/netinet_in_h.m4
 
 Depends-on:
@@ -18,14 +18,14 @@ BUILT_SOURCES += $(NETINET_IN_H)
 
 # We need the following in order to create <netinet/in.h> when the system
 # doesn't have one.
-netinet/in.h:
+netinet/in.h: netinet_in.in.h
        @MKDIR_P@ netinet
        rm -f $@-t $@
        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
              -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
              -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
-             < $(srcdir)/netinet_in_.h; \
+             < $(srcdir)/netinet_in.in.h; \
        } > $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t