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 /m4/filenamecat.m4 | |
| 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 'm4/filenamecat.m4')
| -rw-r--r-- | m4/filenamecat.m4 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index 77a3b6afac..c32283ca90 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,4 +1,4 @@ -# filenamecat.m4 serial 9 +# filenamecat.m4 serial 10 dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,8 +6,14 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FILE_NAME_CONCAT], [ + AC_REQUIRE([gl_FILE_NAME_CONCAT_LGPL]) AC_LIBOBJ([filenamecat]) +]) + +AC_DEFUN([gl_FILE_NAME_CONCAT_LGPL], +[ + AC_LIBOBJ([filenamecat-lgpl]) - dnl Prerequisites of lib/filenamecat.c. + dnl Prerequisites of lib/filenamecat-lgpl.c. AC_CHECK_FUNCS_ONCE([mempcpy]) ]) |