Re: Proposed Module: canonicalize-lgpl

[Paul Eggert]

Here is a slightly different proposal to add that module; it assumes
the 'canonicalize' changes I just installed.  What do you think?

I guess the basic idea here is that we move this module from gettext
to gnulib, so I haven't worried about config/srclist.txt.

2006-11-03  Paul Eggert  <address@hidden>

        New module canonicalize-lgpl, proposed by Charles Wilson.
        * MODULES.html.sh: Add canonicalize-lgpl.
        * lib/canonicalize-lgpl.c: New file, taken from
        gettext/gnulib-local/lib/canonicalize.c with license changed to GPL
        because of gnulib-tool.
        * m4/canonicalize-lgpl.m4: New file, taken from
        gettext/gnulib-local/m4/canonicalize-lgpl.m4 with the following changes:
        (gl_CANONICALIZE_LGPL): Renamed from gl_CANONICALIZE.
        Check for canonicalize_file_name's decl.
        Check functions just once.
        Rename object module to canonicalize-lgpl.
        (gl_PREREQ_CANONICALIZE_LGPL): Renamed from gl_PREREQ_CANONICALIZE.
        All uses changed.  Check functions just once.
        * modules/canonicalize-lgpl: New file.

Index: MODULES.html.sh
===================================================================
RCS file: /cvsroot/gnulib/gnulib/MODULES.html.sh,v
retrieving revision 1.157
diff -p -u -r1.157 MODULES.html.sh
--- MODULES.html.sh     31 Oct 2006 19:16:02 -0000      1.157
+++ MODULES.html.sh     3 Nov 2006 23:21:37 -0000
@@ -1927,6 +1927,7 @@ func_all_modules ()
   func_module acl
   func_module backupfile
   func_module canonicalize
+  func_module canonicalize-lgpl
   func_module clean-temp
   func_module copy-file
   func_module cycle-check
--- ../gettext/gnulib-local/lib/canonicalize.c  2006-09-15 05:01:51.000000000 
-0700
+++ lib/canonicalize-lgpl.c     2006-11-03 15:24:03.000000000 -0800
@@ -2,20 +2,19 @@
    Copyright (C) 1996-2003, 2005-2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
+   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.
 
-   The GNU C Library is distributed in the hope that it will be useful,
+   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
-   Lesser General Public License for more details.
+   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 Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
+   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.  */
 
 #include <config.h>
 
--- ../gettext/gnulib-local/m4/canonicalize.m4  2006-08-02 06:33:35.000000000 
-0700
+++ m4/canonicalize-lgpl.m4     2006-11-03 14:57:44.000000000 -0800
@@ -1,25 +1,26 @@
-# canonicalize.m4 serial 2 (gettext-0.13)
-dnl Copyright (C) 2003 Free Software Foundation, Inc.
+# canonicalize-lgpl.m4 serial 3
+dnl Copyright (C) 2003, 2006 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_CANONICALIZE],
+AC_DEFUN([gl_CANONICALIZE_LGPL],
 [
   dnl Do this replacement check manually because the file name is shorter
   dnl than the function name.
-  AC_CHECK_FUNCS(canonicalize_file_name)
+  AC_CHECK_DECLS_ONCE(canonicalize_file_name)
+  AC_CHECK_FUNCS_ONCE(canonicalize_file_name)
   if test $ac_cv_func_canonicalize_file_name = no; then
-    AC_LIBOBJ(canonicalize)
+    AC_LIBOBJ(canonicalize-lgpl)
     AC_DEFINE([realpath], [rpl_realpath],
       [Define to a replacement function name for realpath().])
-    gl_PREREQ_CANONICALIZE
+    gl_PREREQ_CANONICALIZE_LGPL
   fi
 ])
 
-# Prerequisites of lib/canonicalize.c.
-AC_DEFUN([gl_PREREQ_CANONICALIZE],
+# Prerequisites of lib/canonicalize-lgpl.c.
+AC_DEFUN([gl_PREREQ_CANONICALIZE_LGPL],
 [
   AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
-  AC_CHECK_FUNCS(getcwd readlink)
+  AC_CHECK_FUNCS_ONCE(getcwd readlink)
 ])
--- /dev/null   2005-09-24 22:00:15.000000000 -0700
+++ modules/canonicalize-lgpl   2006-11-03 14:49:31.000000000 -0800
@@ -0,0 +1,27 @@
+Description:
+Canonical absolute file name.
+
+Files:
+lib/canonicalize.h
+lib/canonicalize-lgpl.c
+m4/canonicalize-lgpl.m4
+
+Depends-on:
+alloca-opt
+allocsa
+pathmax
+readlink
+
+configure.ac:
+gl_CANONICALIZE_LGPL
+
+Makefile.am:
+
+Include:
+"canonicalize.h"
+
+License:
+LGPL
+
+Maintainer:
+Bruno Haible