Adapt to new gnulib naming scheme.

* gl/lib/se-context.in.h: Rename from gl/lib/se-context_.h.
* gl/lib/se-selinux.in.h: Rename from gl/lib/se-selinux_.h.
* gl/m4/selinux-context-h.m4: Remove use of AC_LIBSOURCES.
* gl/m4/selinux-selinux-h.m4: Likewise.
* gl/modules/selinux-h (Files, Makefile.am): Reflect renaming.
(Makefile.am) [lib_SOURCES]: Add se-context.in.h and se-selinux.in.h.

diff --git a/ChangeLog b/ChangeLog
index be6ad619b44234c61f379ec998bf6f1dbd6ccdac..b63a4aea3609627172db88c497f08d7b4ee34376 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2007-10-04  Jim Meyering  <jim@meyering.net>
 
+       Adapt to new gnulib naming scheme.
+       * gl/lib/se-context.in.h: Rename from gl/lib/se-context_.h.
+       * gl/lib/se-selinux.in.h: Rename from gl/lib/se-selinux_.h.
+       * gl/m4/selinux-context-h.m4: Remove use of AC_LIBSOURCES.
+       * gl/m4/selinux-selinux-h.m4: Likewise.
+       * gl/modules/selinux-h (Files, Makefile.am): Reflect renaming.
+       (Makefile.am) [lib_SOURCES]: Add se-context.in.h and se-selinux.in.h.
+
        * lib/search_.h: Remove unused file.
 
        * bootstrap (slurp): Adapt to _.h -> .in.h name change.

diff --git a/gl/lib/se-context_.h b/gl/lib/se-context.in.h
similarity index 100%
rename from gl/lib/se-context_.h
rename to gl/lib/se-context.in.h

diff --git a/gl/lib/se-selinux_.h b/gl/lib/se-selinux.in.h
similarity index 100%
rename from gl/lib/se-selinux_.h
rename to gl/lib/se-selinux.in.h

diff --git a/gl/m4/selinux-context-h.m4 b/gl/m4/selinux-context-h.m4
index 4011dde2af4dab8b19d9d0e8403f2feea15ee38b..269c15230ff4d9463192d31fb330d03e13e0ecea 100644 (file)
--- a/gl/m4/selinux-context-h.m4
+++ b/gl/m4/selinux-context-h.m4
@@ -1,5 +1,5 @@
 # serial 1   -*- Autoconf -*-
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 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.
@@ -9,7 +9,6 @@
 
 AC_DEFUN([gl_HEADERS_SELINUX_CONTEXT_H],
 [
-  AC_LIBSOURCES([se-context_.h])
   # Check for <selinux/context.h>,
   AC_CHECK_HEADERS([selinux/context.h],
                   [SELINUX_CONTEXT_H=],

diff --git a/gl/m4/selinux-selinux-h.m4 b/gl/m4/selinux-selinux-h.m4
index 13ce2ac9ade49abc29365d45275fff71efcb895c..822ffa20941c1cc9414eab32a8b9bdb9d4264d0b 100644 (file)
--- a/gl/m4/selinux-selinux-h.m4
+++ b/gl/m4/selinux-selinux-h.m4
@@ -1,5 +1,5 @@
 # serial 1   -*- Autoconf -*-
-# Copyright (C) 2006 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2007 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.
@@ -9,7 +9,6 @@
 
 AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H],
 [
-  AC_LIBSOURCES([se-selinux_.h])
   # Check for <selinux/selinux.h>,
   AC_CHECK_HEADERS([selinux/selinux.h],
                   [SELINUX_SELINUX_H=],

diff --git a/gl/modules/selinux-h b/gl/modules/selinux-h
index 915b9d2765e11c7d6f92fb4d2e8a58d442e2e5bb..97a70c998c4d7cd847adc4239c346c186058dda6 100644 (file)
--- a/gl/modules/selinux-h
+++ b/gl/modules/selinux-h
@@ -2,8 +2,8 @@ Description:
 SELinux-related headers for systems that lack them.
 
 Files:
-lib/se-context_.h
-lib/se-selinux_.h
+lib/se-context.in.h
+lib/se-selinux.in.h
 m4/selinux-context-h.m4
 m4/selinux-selinux-h.m4
 
@@ -14,18 +14,20 @@ gl_HEADERS_SELINUX_SELINUX_H
 gl_HEADERS_SELINUX_CONTEXT_H
 
 Makefile.am:
+lib_SOURCES += se-context.in.h se-selinux.in.h
+
 BUILT_SOURCES += $(SELINUX_SELINUX_H)
-selinux/selinux.h: se-selinux_.h
+selinux/selinux.h: se-selinux.in.h
        mkdir -p selinux
-       cp $(srcdir)/se-selinux_.h $@-t
+       cp $(srcdir)/se-selinux.in.h $@-t
        chmod a-x $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += selinux/selinux.h selinux/selinux.h-t
 
 BUILT_SOURCES += $(SELINUX_CONTEXT_H)
-selinux/context.h: se-context_.h
+selinux/context.h: se-context.in.h
        mkdir -p selinux
-       cp $(srcdir)/se-context_.h $@-t
+       cp $(srcdir)/se-context.in.h $@-t
        chmod a-x $@-t
        mv $@-t $@
 MOSTLYCLEANFILES += selinux/context.h selinux/context.h-t