diff options
| author | Eric Blake <ebb9@byu.net> | 2009-10-29 12:00:03 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2009-10-29 18:39:38 -0600 |
| commit | b3338b6328b7abb86cc2ba8882074ea22d195e98 (patch) | |
| tree | f680fc4cb08a271122f8c82f82dbe1b0e7bb569b /lib/filenamecat.h | |
| parent | ce2d0d6e770dbf138ed4fb7649b593412b22122a (diff) | |
| download | gnulib-b3338b6328b7abb86cc2ba8882074ea22d195e98.tar.gz | |
filenamecat: split into filenamecat-lgpl
The concept of filenamecat is simple enough to use in an LGPL
manner, even though current clients are GPL for other reasons.
At any rate, it is nice to separate mfile_name_concat into its
own file so that the linker does not fail without xalloc_die.
* modules/filenamecat-lgpl: New module.
* modules/filenamecat (Files): Move library-safe files into
filenamecat-lgpl.
(Depends-on): Add filenamecat-lgpl.
(configure.ac): Declare witness.
* lib/filenamecat.h (file_name_concat): Only declare when using
GPL module.
* lib/filenamecat.c (longest_relative_suffix, mfile_name_concat):
Move...
* lib/filenamecat-lgpl.c: ...into new file.
* m4/filenamecat.m4 (gl_FILE_NAME_CONCAT_LGPL): New macro.
(gl_FILE_NAME_CONCAT): Use it.
* MODULES.html.sh (File system functions): Mention new module.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'lib/filenamecat.h')
| -rw-r--r-- | lib/filenamecat.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/filenamecat.h b/lib/filenamecat.h index 334c887c77..df5360b18b 100644 --- a/lib/filenamecat.h +++ b/lib/filenamecat.h @@ -1,6 +1,7 @@ /* Concatenate two arbitrary file names. - Copyright (C) 1996, 1997, 2003, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2003, 2005, 2007, 2009 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 @@ -17,8 +18,10 @@ /* Written by Jim Meyering. */ +#if GNULIB_FILENAMECAT char *file_name_concat (char const *dir, char const *base, char **base_in_result); +#endif char *mfile_name_concat (char const *dir, char const *base, char **base_in_result); |