Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / m4 / filenamecat.m4

diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4
index 77a3b6a..6c6656a 100644 (file)
--- a/m4/filenamecat.m4
+++ b/m4/filenamecat.m4
@@ -1,13 +1,16 @@
-# filenamecat.m4 serial 9
-dnl Copyright (C) 2002-2006, 2009 Free Software Foundation, Inc.
+# filenamecat.m4 serial 11
+dnl Copyright (C) 2002-2006, 2009-2014 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_FILE_NAME_CONCAT],
 [
-  AC_LIBOBJ([filenamecat])
+  AC_REQUIRE([gl_FILE_NAME_CONCAT_LGPL])
+])
 
-  dnl Prerequisites of lib/filenamecat.c.
+AC_DEFUN([gl_FILE_NAME_CONCAT_LGPL],
+[
+  dnl Prerequisites of lib/filenamecat-lgpl.c.
   AC_CHECK_FUNCS_ONCE([mempcpy])
 ])