New module 'xconcat-filename', split off from module 'concat-filename'.

5 files changed, 31 insertions, 5 deletions

diff --git a/modules/concat-filename b/modules/concat-filename
index 4aade38971..70ad9f601a 100644
--- a/modules/concat-filename
+++ b/modules/concat-filename
@@ -8,7 +8,7 @@ lib/concat-filename.c
 
 Depends-on:
 filename
-xalloc
+malloc-posix
 stpcpy
 
 configure.ac:
@@ -20,7 +20,7 @@ Include:
 "concat-filename.h"
 
 License:
-GPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible
diff --git a/modules/findprog b/modules/findprog
index 0fffcf3e0d..7ed99e982f 100644
--- a/modules/findprog
+++ b/modules/findprog
@@ -10,7 +10,7 @@ m4/eaccess.m4
 Depends-on:
 stdbool
 xalloc
-filename
+xconcat-filename
 unistd
 
 configure.ac:
diff --git a/modules/javacomp b/modules/javacomp
index a42589d5da..3bc33b81fe 100644
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -20,7 +20,7 @@ safe-read
 xalloc
 xmalloca
 getline
-filename
+xconcat-filename
 fwriteerror
 clean-temp
 error
diff --git a/modules/javaexec b/modules/javaexec
index ca53910518..1e397a07b0 100644
--- a/modules/javaexec
+++ b/modules/javaexec
@@ -11,7 +11,7 @@ execute
 classpath
 xsetenv
 sh-quote
-filename
+xconcat-filename
 xalloc
 xmalloca
 error
diff --git a/modules/xconcat-filename b/modules/xconcat-filename
new file mode 100644
index 0000000000..b8cb087537
--- /dev/null
+++ b/modules/xconcat-filename
@@ -0,0 +1,26 @@
+Description:
+Construct a full filename by concatenating a directory name, a relative
+filename, and a suffix, with out-of-memory checking.
+
+Files:
+lib/concat-filename.h
+lib/xconcat-filename.c
+
+Depends-on:
+concat-filename
+xalloc-die
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += xconcat-filename.c
+
+Include:
+"concat-filename.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+